Update code from nukeviet (23/05/2014)