Merge pull request #1 from gpdowning/master

another commit