Merge pull request #16 from ielgnaw/1.0.0-dev

1.0.0 dev