Merge pull request #8 from berq/patch-8