nub 1st commit
Merge branch 'nubik' into nowy_barnab