Merge pull request #5 from runemopar/master

gib to me
what am i doing
Merge pull request #4 from jordanlm/master

smoop