Update code from nukeviet (26/02/2014)