Merge pull request #10 from Anh3h/develop