Update code from nukeviet shops (03/04/2014)