Update code from nukeviet (29/04/2014)