Merge pull request #624 from bursech/master

Added entity id and type to dictionary object in export.