Merge pull request #5 from zhaovin/master

Merge pull request #6 from yehua98/master
ET  updates

ET updates
Merge pull request #7 from yehua98/master

ET updates