Fixed code style
Merge origin/master