diff --git a/.gitignore b/.gitignore
index a6f89c2..4cc2326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/target/
\ No newline at end of file
+/target/
+typeconverter.iml
+.idea/
diff --git a/src/main/java/com/toddfast/util/convert/TypeConverter.java b/src/main/java/com/toddfast/util/convert/TypeConverter.java
index ce0abc3..eca5e0f 100644
--- a/src/main/java/com/toddfast/util/convert/TypeConverter.java
+++ b/src/main/java/com/toddfast/util/convert/TypeConverter.java
@@ -177,6 +177,17 @@ private static Map<Object,Conversion<?>> getTypeConversions() {
 		return typeConversions;
 	}
 
+	/**
+	 * Return an immutable copy of the currently registered type conversion
+	 * objects.  The keys for the values in this map may be arbitrary objects, but
+	 * the values are of type <code>Conversion</code>
+	 *
+	 * @return Copy of the registred type conversions
+	 */
+	public static Map<Object,Conversion<?>> getRegisteredTypeConversions() {
+		return Collections.unmodifiableMap(new LinkedHashMap<Object,Conversion<?>>(typeConversions));
+	}
+
 	/**
 	 * Register a type conversion object under the specified key. This
 	 * method can be used by developers to register custom type conversion 
@@ -188,14 +199,6 @@ public static void registerTypeConversion(Object key,
 		typeConversions.put(key,conversion);
 	}
 
-	/**
-	 * Unregister a type conversion object under the specified key
-	 *
-	 */
-	public static void unregisterTypeConversion(Object key) {
-		typeConversions.remove(key);
-	}
-
 	/**
 	 * Register a type conversion object under the specified keys. This
 	 * method can be used by developers to register custom type conversion
@@ -214,6 +217,14 @@ public static void registerTypeConversion(Conversion<?> conversion) {
 		}
 	}
 
+	/**
+	 * Unregister a type conversion object under the specified key
+	 *
+	 */
+	public static void unregisterTypeConversion(Object key) {
+		typeConversions.remove(key);
+	}
+
 	/**
 	 * Unregister a type conversion object under all keys it specifies via
 	 * the {@link TypeConversion#getTypeKeys} method. Note, if this conversion
@@ -224,7 +235,7 @@ public static void unregisterTypeConversion(Conversion<?> conversion) {
 		if (conversion!=null) {
 			Object[] keys=conversion.getTypeKeys();
 			synchronized (typeConversions) {
-				if (keys==null) {
+				if (keys!=null) {
 					for (int i=0; i<keys.length; i++) {
 						unregisterTypeConversion(keys[i]);
 					}