Merge branch 'release/1.0'
Merge pull request #1 from meriadec/master

Merge branch 'release/1.0'