Merge pull request #83 from davidvossel/master

socket ipc fixes