Merge pull request #13 from berq/patch-13