Merge pull request #3 from dbuchi/master

PR for updating prod with master