A few fixes, please update!
Fixed crash
Merge branch 'master' into development