get rid of the merge conflict
Merge pull request #7 from zillabyte/ben/fix

pull request: @sjarvie -- remove conflict