Pull Request Dev_1.0

Changed $id to $thread_id :+1: