Style fixed
Merge origin/master