Oop

Branch "oop-fix-first-class" was merged to "oop". And now we are going to merge "oop" with "master"