Improve shader API
Merge pull request #31 from pwaller/mrg/shader

Improved shader API