bumped up version numbers
Merge branch 'develop'