Merge pull request #3 from dbuchi/master

PR for updating prod with master
Merge pull request #4 from dbuchi/production

Merge pull request #3 from dbuchi/master