Update code from nukeviet (07/03/2014)