First for new lib - change from kul.local.unix
merge from master