Update code from nukeviet (01/05/2014)