Merge pull request #3 from shurshur/master

handle timeouts for socket.read()
add timestamps to console