Fixing the #23
#27 Fixing textures
#27 Fix to load non square textures
#27 Cleaning up test code