Merge pull request #12 from MarkusWeisser/exchangeablehelm

Exchangeablehelm
Merge remote-tracking branch 'GitHub_origin/master' into exchangeablehelm