Merge pull request #103 from Northcode/dev-Jens

Dev jens
Merge pull request #104 from Northcode/dev

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

Dev jens
Merge pull request #106 from Northcode/dev

Dev
fixed crash at startup
Merge pull request #107 from Northcode/dev-Jens

Dev jens
merge with dev-A2
Merge with dev-jens