Merge pull request #3 from chrilith/patch-3.