Design Entwurf V1
Merge branch 'master' into beta_01