Merge pull request #45 from Unicaen-DNR2i/dev

Dev