Merge pull request #11 from ielgnaw/master

ecomfe/edp#172
Merge pull request #13 from ielgnaw/master

ecomfe/edp#181
Merge pull request #2 from ecomfe/master

merge