Lots of changes, fixed crashing
Merge remote-tracking branch 'origin/master'