Fix wrong title and comment
Merge branch 'develop'