major update and function change/extension
Authored by: widmfeli 2020-04-05
Parent: [r543]
Child: [r545]