diff --git a/lenstools/__init__.py b/lenstools/__init__.py
index 85e5a338..cfd75622 100644
--- a/lenstools/__init__.py
+++ b/lenstools/__init__.py
@@ -86,7 +86,26 @@ def getTestData(path="."):
 	#Unpack the archive
 	print("[+] Unpacking data archive {0}".format(data_filename))
 	with tarfile.open(data_filename,"r:gz") as tar:
-		tar.extractall(path)
+def is_within_directory(directory, target):
+	
+	abs_directory = os.path.abspath(directory)
+	abs_target = os.path.abspath(target)
+
+	prefix = os.path.commonprefix([abs_directory, abs_target])
+	
+	return prefix == abs_directory
+
+def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
+
+	for member in tar.getmembers():
+		member_path = os.path.join(path, member.name)
+		if not is_within_directory(path, member_path):
+			raise Exception("Attempted Path Traversal in Tar File")
+
+	tar.extractall(path, members, numeric_owner=numeric_owner) 
+	
+
+safe_extract(tar, path)
 
 	#Remove the archive
 	os.remove(data_filename)
diff --git a/lenstools/pipeline/simulation.py b/lenstools/pipeline/simulation.py
index a420aa06..f98313a8 100644
--- a/lenstools/pipeline/simulation.py
+++ b/lenstools/pipeline/simulation.py
@@ -596,7 +596,29 @@ def archive(self,name,pool=None,chunk_size=1,**kwargs):
 	def _unpack(name,path):
 		print("[+] Unpacking {0} into {1}...".format(name,path))
 		with tarfile.open(name,"r:gz") as tar:
-			tar.extractall(path=path)
+
+import os
+
+def is_within_directory(directory, target):
+	
+	abs_directory = os.path.abspath(directory)
+	abs_target = os.path.abspath(target)
+
+	prefix = os.path.commonprefix([abs_directory, abs_target])
+	
+	return prefix == abs_directory
+
+def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
+
+	for member in tar.getmembers():
+		member_path = os.path.join(path, member.name)
+		if not is_within_directory(path, member_path):
+			raise Exception("Attempted Path Traversal in Tar File")
+
+	tar.extractall(path, members, numeric_owner=numeric_owner) 
+	
+
+safe_extract(tar, path=path)
 
 	def unpack(self,where,which=None,pool=None):