Updated version file
Fixed server-side crash
Merge branch 'origin/master'