Merge pull request #4 from vuthao/develop

develop