Update code from nukeviet (14/04/2014)