Merge pull request #14 from alephtwo/master

ben's changes