Merge pull request #70 from Northcode/dev

Dev
Merge pull request #72 from Northcode/dev

Dev
Merge pull request #74 from Northcode/dev-Jens

Dev jens