Merge branch 'release/0.1.5'
fixes 1 added test case
Merge branch 'hotfix/0.1.6' into develop