Update code from nukeviet (25/03/2014)