Fix bug: #362
Fix bug: #363
Fix bug: #348
[sync] 1.0.1
Merge pull request #364 from otiai10/develop

[sync master] 1.0.1