Merge pull request #483 from Maaack/improve-options-menu