tweak some code
Merge branch 'develop'