fixed all the warnings
Merge branch 'master' into BVH