Merge pull request #11 from berq/patch-11