Version 1.2.0

Hopefully I can merge this without too much trouble...