Update code from nukeviet (21/12/2014)