Updating to newer version from master branch