Merge pull request #3 from ngkaho1234/master