Merge pull request #2 from sparker888/master

merging production into master
Merge pull request #3 from sparker888/production

Merge pull request #2 from sparker888/master