Merge pull request #25 from silveur/develop

1.0.0
Merge pull request #26 from silveur/master

Merge pull request #25 from silveur/develop