Merge pull request #41 from Northcode/dev

Dev
stuff
Merge pull request #42 from Northcode/dev-Andreas

Dev andreas
Merge pull request #44 from Northcode/dev-Jens

Dev jens