#26, #28 fixed, add docu