diff --git a/.gitignore b/.gitignore
index 0680a75..c423c52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,60 @@
-*.pyc
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
-htmlcov
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IDE/Editor stuff
+.idea/*
\ No newline at end of file
diff --git a/multi_email_field/fields.py b/multi_email_field/fields.py
index 4cd5f09..192a9ec 100644
--- a/multi_email_field/fields.py
+++ b/multi_email_field/fields.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.db import models
 
 from multi_email_field.forms import MultiEmailField as MultiEmailFormField
@@ -31,5 +32,7 @@ def to_python(self, value):
     def get_internal_type(self):
         return 'TextField'
 
-from south.modelsinspector import add_introspection_rules
-add_introspection_rules([], ["multi_email_field.fields.MultiEmailField"])
+
+if 'south' in settings.INSTALLED_APPS:
+    from south.modelsinspector import add_introspection_rules
+    add_introspection_rules([], ["multi_email_field.fields.MultiEmailField"])