Added save_world()
Merge origin/master