Update code from nukeviet (01/04/2014)