Merge pull request #4 from berq/patch-4