Added files from stb branch