Merge pull request #141 from Northcode/dev

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

Merge pull request #141 from Northcode/dev