Hi Dave,
I attached a patch for #197.Please be so kind to review, if this was all about this issue.
RegardsSteffen