Merge pull request #13 from ScrambledEgge101/Jason2

Merge pull request #12 from ScrambledEgge101/master