Merge pull request #2 from nukeviet/develop

update 1