Merge pull request #97 from reem-utils/chang_branch

Chang branch
Updates for Emergency_Situation and its child SMs