Merge pull request #444 from hnyman/fixconntrack