Added @Override and improved Javadoc.
Improved Javadoc.