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

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

Dev jens