code style fixed
Merge branch 'patch'