fix code style
Merge composer/master