fixes #21
Merge branch 'v1.2.2'