Merge pull request #162 from flexiblepower/development_thijl

Development thijl
Merge branch 'development' of https://github.com/flexiblepower/powermatcher into development_thijl