update code from NukeViet 27042014