Merge pull request #9 from berq/patch-9