updated style merged with latest
Merge remote-tracking branch 'origin'