Fix bug: #398
[sync] 1.3.3
Merge pull request #399 from otiai10/develop

[sync master] 1.3.3