Fix documentation error
Merge branch 'mcowger-master'