#123: Bug fix.
Merge branch 'master' of https://github.com/mnakao/test