Merge pull request #22 from newavenue/staging

Staging