Merge pull request #14 from ielgnaw/1.0.0-dev

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

Merge pull request #14 from ielgnaw/1.0.0-dev