Merge pull request #18 from CubeEngine/jdocs-quickfix

Fixed javadoc errors
Merge branch 'upstream'