Update code from nukeviet (14/02)