Merge pull request #45 from Unicaen-DNR2i/dev

Dev
Merge pull request #46 from Unicaen-DNR2i/master

Merge pull request #45 from Unicaen-DNR2i/dev