Merge pull request #5 from ecomfe/1.0.0-dev

Merge pull request #15 from ielgnaw/1.0.0-dev
Merge pull request #6 from ecomfe/1.0.0-dev

1.0.0 dev
'ecomfe/edp#233'
optimize code
ecomfe/edp#213
fix ecomfe/edp#248
optimize code
Merge pull request #16 from ielgnaw/1.0.0-dev

1.0.0 dev