Merge pull request #2 from zhaozheid/master

update
Merge pull request #3 from zhaozheid/master

update code with remote repository
changes
fix conflict
Merge pull request #59 from joeyzhang1989/master

fix conflict and adjust javadoc