Started adding shader wrappers
Merge branch 'origin/master'