Update code from nukeviet (17/03/2014)