Consistency fix #109
Merge branch 'master' into right_menu