Update documentation after merge of #34