Fix for JDK 1.6.
Update copyright notice.