Modified raytrace to work properly now.
Merge branch 'bas'