Update code from nukeviet (22/07/2014)