Re-style of Analysis and M&S
Merge remote-tracking branch 'origin/master'