Restored most of last weeks changes....
Merge branch 'attempt3' of https://github.com/radke-tum/idp.git into attempt3