Update to official master branch