Updates emergency
Merge pull request #378 from reem-utils/roger_branch

Updates emergency