Merge pull request #8 from jpkeane/master

Rebase staging