Merge pull request #1 from zhouyejoe/master

first commit from joe
change catch statement
Merge pull request #1 from wxx5433/master

Get the modification from WXX