After all, Keegan's patch was landed.

Tetsuharu's patch is taken over to Keegan's one.
Merge pull request #3 from saneyuki/fix

After all, Keegan's patch was landed.