troll handling 2
Merge branch 'master' of github.com:SRechenberger/s0pra