Merger pull request #7 from ngtnah/master