Merge pull request #44 from Northcode/dev-Jens

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

Dev andreas
Merge pull request #46 from Northcode/dev-Jens

UserData stuff
Update README.md
Merge branch 'dev' into dev-Jens