Merge pull request #1 from sparker888/development

Pulled development into master
Merge pull request #2 from sparker888/master

Merge pull request #1 from sparker888/development