Merge pull request #25 from silveur/develop

1.0.0