Update code from nukeviet (27/05/2014)