Update code from nukeviet (07/04/2014)