Merge pull request #7 from berq/patch-7