Update by shuguo 14-11-22