Merge pull request #6 from danhooper/staging

Staging
Merge pull request #8 from danhooper/staging

Staging
Merge branch 'master' into staging