More userdata stuff
Merge pull request #47 from Northcode/dev-Andreas

Dev andreas
Merge branch 'dev' into dev-Jens
Merge pull request #48 from Northcode/dev-Jens

Dev jens