Merge pull request #5 from newdynamx/production

Merge pull request #4 from newdynamx/staging