added test and fixed problem in initializing comment
added the reset and fixed merge errors
Merge pull request #11 from tienyuan/testing-our-error

added test and fixed problem in initializing comment