Update for 1.2

Fixes #13 

@matryer please review and merge