Merge pull request #1 from darsee/master

Tracker improvements
Merge pull request #2 from darsee/master

Fix for peers being prematurely timed out