Merge pull request #3 from maplehua/checkAndTest

Check and test