Bumped version number.
Merge branch 'prep-0.5' into develop