Fix bug #377
[sync] 1.0.9
Merge pull request #385 from otiai10/develop

[sync master] 1.0.9