diff --git a/Makefile b/Makefile
index 36f021648..87a703ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,10 @@ ifeq ($(IGL_WITH_BOOST),1)
 	EXTRA_DIRS+=include/igl/boost
 	EXTRAS += boost
 endif
+ifeq ($(IGL_WITH_SVD3X3),1)
+	EXTRA_DIRS+=include/igl/svd3x3
+	EXTRAS += svd3x3
+endif
 
 .PHONY: examples
 .PHONY: extras
diff --git a/Makefile.conf b/Makefile.conf
index 5b2d4ab62..ca51cc0d3 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -130,13 +130,15 @@ ifeq ($(IGL_USERNAME),stefanmessmer)
 	IGL_WITH_PNG=0
 	IGL_WITH_XML=0
 	IGL_WITH_BOOST=0
+	IGL_WITH_SVD3X3=1
 	#OPENGL_INC=-I$(DEFAULT_PREFIX)/include
 	#OPENGL_LIB=-lGL -lGLU
 	# Glut is needed only for examples
 	#GLUT_LIB=-lglut
 	#ANTTWEAKBAR_LIB=-lAntTweakBar
 	OPENPMP = -openmp
-	AFLAGS= -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENGL -arch armv7s -arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk
+	AFLAGS = -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENGL -arch armv7s -arch armv7 -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk
+	AFLAGS_SIMULATOR = -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENG -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.0.sdk
 endif