#357: #101, #194

opened by TillmannTaape