Merge pull request #24 from joeyzhang1989/master

repair javadoc
Documentation javadoc and code optimization
smallchanges
changes
changes
spellingmistake
Merge remote-tracking branch 'upstream/master'