Version bumped from 0.5.1 to 0.6
Merge branch 'release-0.6'