Merge pull request #10 from berq/patch-10