[parser]
Merge branch 'master' of https://github.com/Rominet/Raytracing
[parser part2]