change default values
Merge branch 'develop'