Merge pull request #836 from a2cy/patch-1