Update code from nukeviet (21/04/2014)