fixed sync and heartbeat interval
Merge branch 'satar-rc2-timetravel' of https://github.com/etemu/satar into satar-rc2-timetravel