fix bug - Fixed #4
Merge branch 'hot-fix' into develop
Merge branch 'develop'