Update code from nukeviet (17/07/2014)