Fixes #17
Merge branch 'release/1.6.1'