Merge pull request #15 from ielgnaw/1.0.0-dev

1.0.0 dev
Merge pull request #5 from ecomfe/1.0.0-dev

Merge pull request #15 from ielgnaw/1.0.0-dev