joining threads and stuff
fix merge conflicts
Merge branch 'mxmo0rhuhn-master'