Merge pull request #5 from ElamT/production

Merge pull request #4 from ElamT/master
Merge pull request #6 from ElamT/master

Merge pull request #5 from ElamT/production