Dikors/merge file 1.9

resolved conflicts, while merging matthias/file-1.9