mitsuhiko Merge pull request #3 from lowks/patch-2