Updated for the release of v0.2.2