h
Merge remote-tracking branch 'origin/master'
fixed ALL the crashes!