update code from NukeViet 09062014