Update code from nukeviet (20/03/2014)