Merge pull request #8 from awoland/patch-3