Update code from nukeviet (12/03/2014)