update code from NukeViet 19062014