Update code from nukeviet (08/03/2014)