rebasing master - fixing conflicts
update build, found missing part