diff --git a/makefile b/makefile
index 0f097c9..f3422b6 100644
--- a/makefile
+++ b/makefile
@@ -22,8 +22,8 @@
 CIPHERS = Caesar Playfair Vigenere Atbash Morse Autokey
 #Other usefull macros
 LIBFLAGS = -shared -std=c++11 -O3 -fPIC -Wall
-EXEFLAGS = -std=c++11 -O3
-TESTFLAGS = -std=c++11 -DTEST_VERSION
+EXEFLAGS = -std=c++11 -O3 -Wall -Wl,-rpath,'$$ORIGIN/lib'
+TESTFLAGS = -std=c++11 -DTEST_VERSION -Wl,-rpath,'$$ORIGIN/lib'
 DEBUGFLAGS = $(TESTFLAGS) -g
 LIBDIR = ./lib
 LIBFILES = $(patsubst %,SourceFiles/%.cpp,$(CIPHERS))
@@ -33,7 +33,7 @@ LIBFILES = $(patsubst %,SourceFiles/%.cpp,$(CIPHERS))
 all: libs CipherStream
 test: libs CiphersTest
 debug: CiphersDBG
-libs: directory $(patsubst %, $(LIBDIR)/lib%.a,$(CIPHERS))
+libs: directory $(patsubst %, $(LIBDIR)/lib%.so,$(CIPHERS))
 LIBS = $(patsubst %, -l%,$(CIPHERS))
 
 directory:
@@ -41,17 +41,17 @@ directory:
 
 
 #Building Libraries
-$(LIBDIR)/lib%.a: SourceFiles/%.cpp
+$(LIBDIR)/lib%.so: SourceFiles/%.cpp
 	$(CXX) $(LIBFLAGS) -o $@ $<
 
 #Building Executables
 CipherStream: main.cpp helperFunctions.hpp
 	$(CXX) $(EXEFLAGS) -o $@ main.cpp -L $(LIBDIR) $(LIBS)
 
-CiphersTest: main.cpp testMain.hpp
+CiphersTest: main.cpp
 	$(CXX) $(TESTFLAGS) -o $@ $< -L $(LIBDIR) $(LIBS)
 
-CiphersDBG: main.cpp testMain.hpp $(LIBFILES)
+CiphersDBG: main.cpp $(LIBFILES)
 	$(CXX) $(DEBUGFLAGS) -o $@ $< $(LIBFILES)
 
 
@@ -60,4 +60,4 @@ CiphersDBG: main.cpp testMain.hpp $(LIBFILES)
 
 #Linux Remove
 clean:
-	rm -f lib/*.a Cipher*
+	rm -f lib/*.so Cipher*