Better maintain socket IDs
Merge pull request #103 from RWOverdijk/hotfix/socket-maintain

Better maintain socket IDs