Fix design a bit
[sync] 0.8.6.3
Merge pull request #325 from otiai10/develop

[sync master] 0.8.6.3