I think we can merge DEV into MASTER... and maybe a new release
Created by: hoelzer
Review: Approved
Looks good! I also did some tests - please feel free to merge and release! thx