solve merge issue
Merge pull request #10 from data-exchange/develop

solve merge issue