Merge branch 'master', remote-tracking branch 'upstream/master'
Fixed linked list problem seen if there was only one item in the list
Merge pull request #3 from Eosis/tcp-timeout-bugfix

Tcp timeout bugfix, thanks to Rupert