updates
Merge pull request #3 from bauman/heartbeating

updates