Fixing another bunch of bugs :)
Upgrading version to 0.2.2 (Release 0.2.2)
Upgrading version to 0.2.3-dev