Merge pull request #2 from sparker888/master

merging production into master