Update code from nukeviet (02/03/2014)