diff --git a/cecil/core/__init__.py b/cecil/core/__init__.py
index 743cab4..989b6e5 100644
--- a/cecil/core/__init__.py
+++ b/cecil/core/__init__.py
@@ -8,41 +8,41 @@ __all__ = ["objproxy", "config"]
 from . import objproxy, config
 
 try:
-	unicode
+    unicode
 except NameError:
-	unicode = str
+    unicode = str
 
 def ascii(s):
     if isinstance(s, bytes):
         return s
-	elif isinstance(s, unicode):
-		return s.encode(u'ascii')
-	else:
-		return str(s)
+    elif isinstance(s, unicode):
+        return s.encode(u'ascii')
+    else:
+        return str(s)
 
 def utf8(s):
     if isinstance(s, bytes):
         return s
-	elif isinstance(s, unicode):
-		return s.encode(u'utf-8')
-	else:
-		return str(s)
+    elif isinstance(s, unicode):
+        return s.encode(u'utf-8')
+    else:
+        return str(s)
 
 def from_ascii(s):
-	if isinstance(s, unicode):
-		return s
-	else:
-		return s.decode(u'ascii')
+    if isinstance(s, unicode):
+        return s
+    else:
+        return s.decode(u'ascii')
 
 def from_latin1(s):
-	if isinstance(s, unicode):
-		return s
-	else:
-		return s.decode(u'latin-1')
+    if isinstance(s, unicode):
+        return s
+    else:
+        return s.decode(u'latin-1')
 
 def from_utf8(s):
-	if isinstance(s, unicode):
-		return s
-	else:
-		return s.decode(u'utf-8')
+    if isinstance(s, unicode):
+        return s
+    else:
+        return s.decode(u'utf-8')
 
diff --git a/setup.py b/setup.py
index eb32b1f..b7b4280 100755
--- a/setup.py
+++ b/setup.py
@@ -5,41 +5,41 @@ import sys
 import shutil
 import distutils.sysconfig
 try:
-	from cPickle import load, dump
+    from cPickle import load, dump
 except ImportError:
-	from pickle import load, dump
+    from pickle import load, dump
 
 packages=['cecil', 'cecil.core']
 
 if sys.argv[1] == 'clean':
-	for dir in packages:
-		dir_to_remove = os.path.join(distutils.sysconfig.get_python_lib(), dir)
-		assert len(dir_to_remove) > (len(distutils.sysconfig.get_python_lib()) + 1)
-		shutil.rmtree(dir_to_remove)
+    for dir in packages:
+        dir_to_remove = os.path.join(distutils.sysconfig.get_python_lib(), dir)
+        assert len(dir_to_remove) > (len(distutils.sysconfig.get_python_lib()) + 1)
+        shutil.rmtree(dir_to_remove)
 else:
-	majorversion = '1.1.0'
-	buildnumber = 0
-	if os.path.exists('buildnum'):
-		fd = open('buildnum', 'rb')
-		try:
-			vinfo = load(fd)
-			mv, bn = vinfo
-			if mv == majorversion:
-				buildnumber = bn
-		except:
-			pass
-		fd.close()
-	buildnumber += 1
-	fd = open('buildnum', 'wb')
-	dump((majorversion, buildnumber), fd)
-	fd.close()
-	
-	ver = '%s' % (majorversion,)
-	print("Building version %s" % (ver,))
-	setup(
-		name='pycecil',
-		version=ver,
-		packages=packages		
-		)
-	if os.path.exists("setup.py") and os.path.exists("build"):
-		shutil.rmtree("build")
+    majorversion = '1.1.0'
+    buildnumber = 0
+    if os.path.exists('buildnum'):
+        fd = open('buildnum', 'rb')
+        try:
+            vinfo = load(fd)
+            mv, bn = vinfo
+            if mv == majorversion:
+                buildnumber = bn
+        except:
+            pass
+        fd.close()
+    buildnumber += 1
+    fd = open('buildnum', 'wb')
+    dump((majorversion, buildnumber), fd)
+    fd.close()
+    
+    ver = '%s' % (majorversion,)
+    print("Building version %s" % (ver,))
+    setup(
+        name='pycecil',
+        version=ver,
+        packages=packages       
+        )
+    if os.path.exists("setup.py") and os.path.exists("build"):
+        shutil.rmtree("build")