Fixing up remaining edge cases
Updated CHANGELOG
Release 0.2.1