Update code from nukeviet (08/08/2014)