Comments-Fixing

Fixed Issue #220 and fixed merge-errors (some features of yesterday for #222 were lost in current develop branch)