v0.2.1 :: Bug fixes, refactoring, blah blah blah