Impovements from Franz Mauch implemented


Signed-off-by: Johannes Strasser <johannes.strasser@strasys.at>