Merge pull request #1 from NJUOPEN/master

20141007
Merge pull request #3 from zwpwjwtz/master

Merge pull request #1 from NJUOPEN/master