fixes #37 fixes #38
Merge branch 'release/1.2.0'