Merge pull request #1 from oroulet/master

merge dev branch
added cpp implementation of restore (raytracing)
small renaming