Merge pull request #4 from managlea/staging

[Accept #78333478]
Merge pull request #5 from managlea/master

Merge pull request #4 from managlea/staging