Merge pull request #3 from landrews/master

updating
Merge pull request #4 from landrews/production

Merge pull request #3 from landrews/master