Updated coding style
Merge remote-tracking branch 'origin' into release