Update code from nukeviet (18/03/2014)