Update code from nukeviet (18/10/2014)