Merge branch 'new-server'
Merge branch 'new-server'
Merge branch 'new-server'
Fixes #21

Added automated heartbeat protocol
Merge branch 'master' into new-server