Bumped version number
Merge branch 'develop' into Christian