Merge pull request #903 from stephengroat/patch-1