Merge Ray-casting
Fixed POI
Merged 'develop'.