Adding threads
Cleanup
merged
Merge remote-tracking branch 'original/master'