Update documentation after merge of pull req #32