Merge pull request #57 from jacobwagner/master

fix the things