Merge pull request #5 from berq/patch-5