Merge pull request #37 from jacobwagner/master

bad bad bad