Bumping version for development version
Merge branch 'develop'