0.6.1 Release

If you want code in the 0.6.1 release, this is the branch to make your Pull Request into. Cheers!