fixed the refresh bug
update
Merge branch 'dev'
test1