fix: the last merge and unit tests
Merge pull request #3 from surasint/master

fix: the last merge and unit tests