#91 improved some comments