Update code from nukeviet (14/05/2014)