Prep for release
Merge branch 'release/0.1.7' into develop