compliant with edp-1.0.0
Merge pull request #1 from ecomfe/1.0.0-dev

compliant with edp-1.0.0