Merge pull request #12 from berq/patch-12