Merge pull request #1 from sethduncan/prod

Prod
Merge pull request #2 from sethduncan/master

Merge pull request #1 from sethduncan/prod