Merge pull request #7 from Anh3h/develop