EDO of 23 July

changes as per ie issue
Merge branch 'master' of https://github.com/LegendaryAks/EMR