Restored deleted files
Fixed master branch
Merge branch 'master'
Fixed TrevBranch