Updated some documentation
Merge branch 'master' into davis-dev