Merge pull request #119 from Northcode/dev-Andreas

Dev andreas
Merge pull request #120 from Northcode/dev

p
finishing
Merge pull request #122 from Northcode/dev-Jens

Dev jens
Merge pull request #123 from Northcode/dev

dev