Merge pull request #6 from petercunning/master

updates
Merge pull request #7 from petercunning/staging

Merge pull request #6 from petercunning/master