New: implemented Issue #9