Bring ubuntu branch and master branch together