Merge pull request #25 from btaidm/master

Client can restart and connect to same server after death