Merge pull request #17 from ielgnaw/1.0.0-dev

merge
Merge pull request #9 from ecomfe/1.0.0-dev

Merge pull request #17 from ielgnaw/1.0.0-dev