Merge pull request #73 from reem-utils/chang_branch

Chang branch
Updates for emergency_situation