Merge pull request #615 from jrblevin/issue613-2