Update code from nukeviet (108/04/2014)