Merge pull request #16 from ScrambledEgge101/master

Merge pull request #15 from ScrambledEgge101/Jason2
Merge pull request #17 from ScrambledEgge101/Jason2

Merge pull request #16 from ScrambledEgge101/master