Merge pull request #20 from ZooTypers/master

update
Fixed javadocs
Merge pull request #125 from cdallas/master

Fixed javadocs
Merge pull request #6 from ZooTypers/master

pull