Version 1.2.1

Completed documentation and minor stuff for previous commit.