Merge pull request #4 from petercunning/production

Merge pull request #3 from petercunning/master