update code from NukeViet 24042014