Update code from nukeviet (11/05/2014)