Merge pull request #7 from yehua98/master

ET updates
Merge pull request #6 from zhaovin/master

pull latest