Update and regenerate JavaDoc
Optimize background rendering
Merge branch 'dev'