Fix
Fix again
Use userdata
Merge pull request #220 from dalkon/master

Fix