Properly increment version number
Merge branch 'develop'