Merge pull request #1 from jarus/patch-1