Merge pull request #5 from jordanlm/master

getting all your crap