Fix for #10 #11, refactored Image2D to Texture