Merge pull request #126 from riking/patch-3