Fixed some of Joshs crappy code
Merge pull request #2 from johnkabler/master

Fixed some of Joshs crappy code