Updated for the release of v1.2.1