Changes for EMI-3 accounting support
Merge pull request #25 from jouvin/emi-2

Changes for EMI-3 accounting support