solve javadoc conflict
Merge pull request #40 from joeyzhang1989/master

solve javadoc conflict