updated a few things
Merge pull request #5 from Syrexide/master

updated a few things