Updated to 1.2

Closes #4 and #5