Updated comments : D
Updated comments : D
Merge origin/master
Joining threads properly.