Update code from nukeviet (16/03/2014)