Fix?
Merge pull request #75 from SSD-ESIEA/userData

Fix?
Merge pull request #76 from SSD-ESIEA/dev

Dev