Update code from nukeviet (16/05/2014)