Fixed EOF shaders
Merge origin/master