update code from NukeViet

update code from NukeViet