Updated copyright and JavaDoc