Update code from nukeviet (21/07/2014)