Added minor details
fixed minor style details
Merge remote-tracking branch 'origin'