Merge pull request #1 from tonyliu830204/develop

i change branch at 11
Merge branch 'master' into junjun
hahah