Merge pull request #5 from jordanlm/master

getting all your crap
Merge pull request #7 from runemopar/master

Merge pull request #5 from jordanlm/master