Merge pull request #664 from jrblevin/issue-663