Merge pull request #1176 from Diapolo/project-file