Update code from nukeviet (30/03/2014)