Merge pull request #274 from ZappoMan/master

Fixed menu behavior