Fixes derp
Merge pull request #447 from hilburn/master

Fixes derp