Revert "Revert "Bla hast du ja mitbekommen.... [v1.0a1 build 4]""

This reverts commit d3640224a47f4d76ff9f9cd0b9f57f39ba5a6633.