Merge pull request #12 from linhnt/develop

Develop