New format for docs
Merge remote-tracking branch 'origin/master'