Updates Emergency
Merge pull request #161 from reem-utils/chang_branch

Updates Emergency