Merge pull request #19 from newavenue/staging

Staging