Adding ShaderLibrary
Adding bug fix