UserData improvements
Merge pull request #84 from Northcode/dev-Jens

UserData improvements