tlubke Merge pull request #1 from mwilliams/patch-1