Updated to v. 0.8b5: improved thread matching.