bla
Merge pull request #261 from Jalle19/patch-2

Same as #260 but for the "develop" branch