Update code from nukeviet (17/05/2014)