Merge pull request #13 from alephtwo/master

Ben's changes