Fixes #83
Merge pull request #88 from flexiblepower/development_thijl

Fixes #83