Updating some base files before pulling master branch