Update documentation, Fix #21