#196 This implements the proposed changes by @cmarxmeier. This resolves #159 Co-authored-by: cmarxmeier <alladin@routeme.de>
#195
(#76 )