zeug
BIG refractoring
Merge branch 'master' of github.com:hiaselhans/booyapan