Minor changes (e.g. add comment about the authors)
Merge remote-tracking branch 'origin/master'