Merge pull request #48 from Northcode/dev-Jens

Dev jens
Merge pull request #49 from Northcode/dev

Dev
FAKING SUO
Merge pull request #50 from Northcode/dev-Jens

Dev jens
this didn't really work
merge with dev
Merge pull request #53 from Northcode/dev-Andreas

Dev andreas
Merge pull request #54 from Northcode/dev

Dev