Closes #284 (closed) Except of the commit c03ca734 from my POV the previous commits solve this issue.