Added correct files from master branch