Update code from nukeviet (25/05/2014)