update
fix timer
update supplement
merge master