Update code from nukeviet (08/04/2014)