Improved shader loading
Merge pull request #1 from albertvaka/master

Improved shader loading