this better fucking work
Merge pull request #27 from edallman/master

this better fucking work