Update code from nukeviet (17/06/2014)