diff --git a/setup.py b/setup.py
index df618b5..dc31e97 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,13 @@
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext as _build_ext
 
+included_dirs = []
+try:
+	import numpy as np
+	included_dirs.append(np.get_include())
+except:
+	pass
+
 #Test if numpy is installed
 class build_ext(_build_ext):
     def finalize_options(self):
@@ -12,6 +19,7 @@ def finalize_options(self):
         __builtins__.__NUMPY_SETUP__ = False
         import numpy as np
        	self.include_dirs.append(np.get_include())
+       	included_dirs.append(np.get_include())
 
 #Add cython modules depending on the availability of cython
 try:
@@ -22,15 +30,14 @@ def finalize_options(self):
 	use_cython = True
 
 if use_cython:
-	ext_modules = [Extension("tobias.utils.ngs", ["tobias/utils/ngs.pyx"]), #, include_dirs=[np.get_include()]),
-					Extension("tobias.utils.sequences", ["tobias/utils/sequences.pyx"]), #include_dirs=[np.get_include()]),
-					Extension("tobias.utils.signals", ["tobias/utils/signals.pyx"])] #, include_dirs=[np.get_include()])]
-	#cmdclass.update({'build_ext': build_ext})
+	ext_modules = [Extension("tobias.utils.ngs", ["tobias/utils/ngs.pyx"], include_dirs=included_dirs), #,sinclude[np.get_include()]),
+					Extension("tobias.utils.sequences", ["tobias/utils/sequences.pyx"], include_dirs=included_dirs), #include_dirs=[np.get_include()]),
+					Extension("tobias.utils.signals", ["tobias/utils/signals.pyx"], include_dirs=included_dirs)] #, include_dirs=[np.get_include()])]
 
 else:
-	ext_modules = [Extension("tobias.utils.ngs", ["tobias/utils/ngs.c"]), #, include_dirs=[np.get_include()]),
-						Extension("tobias.utils.sequences", ["tobias/utils/sequences.c"]), #, include_dirs=[np.get_include()]),
-						Extension("tobias.utils.signals", ["tobias/utils/signals.c"])] #, include_dirs=[np.get_include()])]
+	ext_modules = [Extension("tobias.utils.ngs", ["tobias/utils/ngs.c"], include_dirs=included_dirs), #, include_dirs=[np.get_include()]),
+					Extension("tobias.utils.sequences", ["tobias/utils/sequences.c"], include_dirs=included_dirs), #, include_dirs=[np.get_include()]),
+					Extension("tobias.utils.signals", ["tobias/utils/signals.c"], include_dirs=included_dirs)] #, include_dirs=[np.get_include()])]
 
 cmdclass = {'build_ext': build_ext}
 
@@ -62,8 +69,9 @@ def readme():
 			'console_scripts': ['TOBIAS=tobias.TOBIAS:main']
 		},
 		ext_modules=ext_modules,
-		cmdclass = cmdclass,
+		cmdclass=cmdclass,
 		setup_requires=["numpy"],
+		include_dirs=included_dirs,
 		#dependency_links=['https://github.com/jhkorhonen/MOODS/releases/download/v1.9.3/MOODS-python-1.9.3.tar.gz#egg=MOODS-python-1.9.3'],	
 		install_requires=[
 			'numpy',