Merge pull request #17 from ielgnaw/1.0.0-dev

merge