Update code from nukeviet (09/05/2014)