Update code from nukeviet (24/04/2014)