Add title for menu
Fix bug in title
Merge branch 'master' into devel