Merge pull request #1 from zgao/master

final