Merge pull request #1 from cherouvim/patch-1