Adding some good files
Another good line to keep
Merge branch 'master' into wint-good