fixes bug
Merge branch 'develop'
updates version
Merge branch 'develop'