Corrected some formatting errors
Merge branch 'documentation' into apache