Update code from nukeviet (15/05/2014)