Addressed PR comments
Fixed conflicts with master
Small improvements
Merge pull request #650 from est77/est_bsdf_sample_refactor

BSDF sample refactor #4