Move matching logic in Connect
Merge pull request #207 from golyshevd/track

Move matching logic in Connect