minor modification
Merge branch 'develop'