Oop3 handling default val

Ignore 2 commits from issue #1