Cleaned up the code a bit, version bump to 0.2.1