Bumped version
Tidying.
Merge branch 'release-0.2.2' into develop