Update code from nukeviet (12/05/2014)