Merge branch 'develop'
bumped version number
Merge branch 'master' into develop