Merge pull request #1 from Wohlstand/master

Update with Wohlstand's repo (menus working with MacOS)
Merge pull request #3 from jpmac26/master

Merge pull request #1 from Wohlstand/master