Version bump
Refactor, add 10s timeout & handle timeout/socket errors