Merge pull request #706 from jrblevin/issue-705