Merge pull request #1 from code2014/master

Ask for update
Merge pull request #2 from XueWei/master

Merge pull request #1 from code2014/master