Fixed world loading and saving
Merge remote-tracking branch 'origin/master'