Release prep
Merge branch 'release/0.1.6' into develop