make style applied
Merge branch 'master' into coding_standards