v1.2.0 commit.

More control. Closes #133, closes #132 and closes #130.