Use references to pass / hold OSL related classes.
Fixed conflict with master.
Fixed PR comments.
Merge pull request #499 from est77/est

Use references to pass / hold OSL related objects.