Update code from nukeviet (21/05/2014)