Merge pull request #1 from alexanderjeurissen/master

Merge branch 'release/1.0'
Merge pull request #2 from alexanderjeurissen/develop

Merge pull request #1 from alexanderjeurissen/master