added heartbeat
Merge branch 'master' into feature-heartbeat
Merge pull request #2 from alphashack/feature-heartbeat

Feature heartbeat