Jake->GW
Merge branch 'release-0.0.2' into develop