Merge pull request #601 from knocte/sock_improvements