Merge pull request #4 from Hai9527/master

master to mtest2