Merge pull request #10 from JavaCount/master

Change a lot
Merge pull request #32 from gz5710/master

Merge pull request #10 from JavaCount/master