Improved shader parsing code
Improved shader parsing code