Bugfixes, readme update
Merge branch 'master' into release-0.1
Bump version