Merge pull request #4 from jordanlm/master

smoop
Did all dat crap
Merge pull request #6 from runemopar/master

jokull made this kinda function