Issue #89 Making maps unmodifiable, and typed to the ? wildcard, which is more correct
Issue #89 Added missing Javadoc