Merge pull request #7 from runemopar/master

Merge pull request #5 from jordanlm/master
Merge pull request #8 from runemopar/master

did more stuff
things and stuff
Merge pull request #6 from jordanlm/master

Yep