change some properties
Merge branch 'dev'