Update code from nukeviet (19/05/2014)