Merge pull request #62 from Northcode/dev

Dev
almost there!
Merge pull request #63 from Northcode/dev-Jens

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

Dev andreas
Merge pull request #66 from Northcode/dev

Dev