Contains Exactly from Ivalerius Fork...

(I wanted to select only my last commit, but This did not work...)