Closes #173
Merge branch '1.2'