Fixed crashes (I think)
Merge branch 'origin/master'