Fixes #12
Fixes #13

Added terminals for server and client.
Increased the heart beat frequency to 20 seconds. See #21
Merge branch 'master' into new-server