Merge pull request #1 from SDLsun/master

test.SDLsun