Fix ecomfe/edp#194
Merge pull request #1 from ecomfe/1.0.0-dev

Fix ecomfe/edp#194