Upgrading master branch