Merge pull request #67 from Northcode/dev

Dev
FAK
Merge pull request #68 from Northcode/dev-Jens

Dev jens
Merge pull request #69 from Northcode/dev-Andreas

Dev andreas
Merge pull request #70 from Northcode/dev

Dev