Fix
Merge pull request #85 from SSD-ESIEA/userData

Fix
Merge pull request #86 from SSD-ESIEA/dev

Dev