Merge pull request #1 from zhaozheid/master

update code with remote repository
implement javadoc and javadoc adjustment
Merge pull request #53 from joeyzhang1989/master

implement javadoc and adjust existing javadoc