Update code from nukeviet (13/05/2014)