should fix #21
fixes #22
fixes #20
prepping for v1.6
Merge branch 'release/1.6'