loren...commit
Merge pull request #1 from pollyc/master

change me some more