#233 Fix menu generation
Merge branch 'version2.0' into version2.1