Merge pull request #8 from jpkeane/master

Rebase staging
Merge pull request #10 from jpkeane/staging

Merge pull request #8 from jpkeane/master