[sync] 1.0
Merge pull request #360 from otiai10/develop

[sync master] 1.0