changed how some stuff worked
Merge pull request #3 from AdamHolwerda/master

changed how some stuff worked