Enhance documentation, see #86