Merge branch 'develop' into release-0.1
=BG= bump version 0.1.7
Merge branch 'release-0.1' into develop