debug & add some test case
Merge pull request #1 from nighca/develop

debug & add some test case