Merge pull request #4 from alephtwo/master

Pulling ben's version