Merge pull request #3 from maplehua/checkAndTest

Check and test
Merge pull request #4 from maplehua/master

Merge pull request #3 from maplehua/checkAndTest