add control of refresh frequency
Merge remote-tracking branch 'origin/master'