update code from NukeViet 02042014