Update code from nukeviet (27/06/2014)