Merge pull request #53 from SSD-ESIEA/dev

Dev
Merge branch 'master' of https://github.com/SSD-ESIEA/SSD into dev