Fixed saving prev_residents
Merge branch 'master' into kingman