Updated format and notes
Merge remote-tracking branch 'origin/master'