Update code from nukeviet (13/03/2014)