Merge pull request #1 from fandywang/master

updaate from fandy