Merge pull request #6 from Anh3h/master