Merge pull request #3 from petercunning/master

updates
Merge pull request #4 from petercunning/production

Merge pull request #3 from petercunning/master
Merge pull request #6 from petercunning/master

updates