pep8
Bumped version number.
Merge branch 'prep-0.6' into develop