slight modifications
Merge branch 'master' into meppe_menu
remove commented code