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