tried to reduce complexity
Merge branch 'master' of https://github.com/miofferg/de.htwg.se.dog.git