Merge pull request #216 from theponti/development

Merge pull request #215 from theponti/master
Fixes #212
Merge pull request #217 from theponti/bug/menu-disappears-#212

Fixes #212
Merge pull request #218 from theponti/master

Merge from master