Merge pull request #16 from vuthao/develop

Develop