Rebasing to master branch