fixes 1 added test case
Merge branch 'hotfix/0.1.6'