Fix a problem.
Merge remote-tracking branch 'refs/remotes/takuan-osho/master'