Merge pull request #125 from starwing/master

update upstream stb things.