this is prob a bad idea
Merge pull request #32 from Drewzar/master

this is prob a bad idea