Merge pull request #643 from phil-davis/patch-1