Update code from nukeviet (17/11/2014)