Update code from nukeviet (15/03/2014)