Merge pull request #1 from nukeviet/develop

update code from NukeViet