Fixing master branch