Merge branch 'hotfix/0.2.1'
bumped version
Still fixing the merge mess

Sorry, another fixup. :/
Update README
Merge branch 'hotfix/0.2.2' into develop