Merge pull request #2 from DavidFeng/master

heartbeat timeout callback fix, style fix