Merge pull request #2 from Northcode/dev-Andreas

Dev andreas
Merge remote-tracking branch 'origin/dev' into dev-Jens