1st version of combined files
Merge pull request #1 from winterwei/winter

1st version of combined files