#411 - Update documentation with changes from 0ccb8ea