Merge pull request #1 from zgao/master

final
Merge pull request #10 from doctorbatmangod/master

Merge pull request #1 from zgao/master