Merge pull request #261 from trevorbernard/master

Fix issue #259 - Set socket identity now works with 4.0.x