Merge pull request #1 from Wohlstand/master

Update with Wohlstand's repo (menus working with MacOS)