some changes to the thread and more..
Merge remote-tracking branch 'origin/master'