6499796 Merge pull request #111 from bpassos/fix-menu