Added bugfix
Merge of release 1.0 into master
Added hotfix
Added feature 2
Merge pull request #1 from Jeroen-Hulsman/Feature-389729-Feature2

Feature 389729 feature2