Merge entries from v1.5.7
Merge pull request #66 from yama/master

Merge entries from v1.5.7