improved setting title
Merge branch 'develop'