closes #16 closes #22 closes #13
Unterricht
merge