Merge pull request #1 from berq/patch-1