Adding thread ending
Merge origin/master