User storage stuff
Merge pull request #39 from Northcode/dev-Andreas

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

User storage stuff
Merge pull request #41 from Northcode/dev

Dev