Update code from nukeviet (22/11/2014)