Merge pull request #701 from jblemee/patch-1