Merge pull request #637 from jrblevin/issue-635