Merge pull request #11 from nukeviet/develop

Develop
Change type file
test
Merge pull request #27 from vuthao/develop

Develop