Merge from tsoporan

This fixes certain connection issues that might've happened (supposedly).
Additionally, this brings the branch up to date with the upstream code, and fixes a typo in the README.md file.

Comments and critique on this are welcome, although if no one has anything to say, this WILL be merged in.