Merge pull request #1 from cabbey/patch-1