Update code from nukeviet (30/04/2014)