tehn Merge pull request #1 from bensteinberg/master