Merge pull request #8 from Anh3h/develop