Updates emergency
Merge pull request #167 from reem-utils/chang_branch

Updates emergency