Fix layout bug
[sync] 1.0.9.1
Fix layout bug (in modify-original)
[sync] 1.0.9.1
Merge pull request #386 from otiai10/develop

[sync master] 1.0.9.2