Merge pull request #1 from sosandstrom/master

rebase
OPS Exporter does not export all data
Merge pull request #7 from vathanakmao/master

Exporter does not export all data