Merge pull request #2 from Hai9527/master

master to mtest