Merge pull request #2 from berq/patch-2