send heartbeat every 30 or 40 seconds
Merge branch 'master', remote-tracking branch 'origin' into feature-heartbeat
Merge pull request #13 from alphashack/feature-heartbeat

Feature heartbeat