Code style fix
Merge branch 'release-0.1' into develop