Merge branch 'release/0.0.2' into develop
Merge branch 'develop' of https://github.com/shillingp/WebSite into develop