fixing what phil broke, dumbdumb
Merge pull request #30 from edallman/master

fixing what phil broke, dumbdumb