Merging of the dev and master branch
Merging dev and master branches
Merge pull request #45 from Unicaen-DNR2i/dev

Dev