Documentation combined from master
Documentaton formatting