update by etond 20141106