new E(omega), but E(r0).
Merge branch 'master' of https://github.com/pnutus/NHQMReport