Merge pull request #1035 from MordyT/master

Updated with new options

Ylian Saint-Hilaire committed Mar 17, 2020 at 17:19 UTC 572b96247ec14204b480be64d5e21539d3a064f7

No changes.