Merge pull request #54 from SSD-ESIEA/dev

Dev
Merge pull request #57 from SSD-ESIEA/dev

Dev
Merge pull request #59 from SSD-ESIEA/dev

Dev
Merge pull request #62 from SSD-ESIEA/dev

Dev
Merge pull request #64 from SSD-ESIEA/dev

Dev
Merge pull request #67 from SSD-ESIEA/dev

Dev
Fixes
Merge pull request #69 from SSD-ESIEA/userData

User data