Added energy to PSI file
Merge branch 'master' into psi-export