Merge pull request #793 from tru7/patch-1