Merge pull request #268 from pcc/menudeactivate