Merge pull request #638 from lrrb/master