hm...
fix merge fuckup
Merge pull request #65 from mikey179/master

fix merge fuckup