Merge pull request #38 from ryanjbaxter/master

Fix for issue #32
Merge pull request #40 from ryanjbaxter/master

Fixing menu opening code
Merge remote-tracking branch 'upstream/master'