1.2

Fixes #33

@matryer please review and merge