fixed issue #1
Merge branch 'develop'