Merge pull request #1 from mitsuhiko/master

Update