Merge pull request #3 from danhooper/staging

Staging
Merge branch 'master' into staging