fix Issue #6
Merge branch 'fix-menu-bugs'
changed help texts
Merge branch 'refs/heads/master' into 2.1