shifted master branch into proper Ubuntu branch