Merge pull request #4 from yehua98/master

Merge pull request #3 from zhaovin/master
Merge pull request #5 from yehua98/master

ET files from NY
Merge pull request #4 from zhaovin/master

pull latest