fixed a bug
Merge branch 'develop'