Merge branch 'release/0.1.7' into develop
Merge branch 'master' into develop
Bumping version to 0.1.8
Merge branch 'release/0.1.8'