'make style' applied
Merge remote-tracking branch 'origin/master' into cpp_v2