Merge pull request #1 from goodplayer/master

2013.1.19
ceshi
Merge pull request #2 from goodplayer/master

2013.1.19
Merge pull request #1 from ixin/master

merge