diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7675941..c0d2242 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,9 +42,19 @@ endif ()
 add_dependencies(moReader moFileReader)
 target_link_libraries(moReader moFileReader)
 
+install(TARGETS moReader 
+	RUNTIME DESTINATION bin
+)
+install(TARGETS moFileReader 
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+	PUBLIC_HEADER DESTINATION include
+)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/)
+
 option(BUILD_TEST "Set this to ON if you want to build the test" OFF)
 
 if(BUILD_TEST)
     enable_testing()
     add_subdirectory(test)
-endif()
+endif()
\ No newline at end of file
diff --git a/conanfile.py b/conanfile.py
index f5d4121..94b6d5e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -8,9 +8,6 @@ class MofilereaderConan(ConanFile):
     url = "https://github.com/AnotherFoxGuy/conan-MofileReader/"
     description = "This API lets you read .mo-Files and use their content just as you would do with GNUs gettext."
     settings = "os", "compiler", "build_type", "arch"
-    #options = {"shared": [True, False]}
-    #default_options = "shared=False"
-    generators = "cmake"
     exports_sources = "include*", "src*", "CMakeLists.txt"
 
 
@@ -20,12 +17,8 @@ class MofilereaderConan(ConanFile):
         cmake.build()
 
     def package(self):
-        self.copy("*.h", dst="include", src="include")
-        self.copy("*.lib", dst="lib", keep_path=False)
-        self.copy("*.dll", dst="bin", keep_path=False)
-        self.copy("*.so", dst="lib", keep_path=False)
-        self.copy("*.dylib", dst="lib", keep_path=False)
-        self.copy("*.a", dst="lib", keep_path=False)
+        cmake = CMake(self)
+        cmake.install()
 
     def package_info(self):
         self.cpp_info.libs = tools.collect_libs(self)
diff --git a/test/test.cpp b/test/test.cpp
index e3325a7..7a68d83 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -9,7 +9,7 @@ using namespace moFileLib;
 
 TEST_CASE ("Load mo-file", "[ReadFile]")
 {
-	CHECK (moFileReaderSingleton::GetInstance().ReadFile("test.mo") == moFileLib::moFileReader::EC_SUCCESS);
+    CHECK (moFileReaderSingleton::GetInstance ().ReadFile ("test.mo") == moFileLib::moFileReader::EC_SUCCESS);
 }
 
 TEST_CASE ("Lookup string", "[Lookup]")
@@ -20,7 +20,7 @@ TEST_CASE ("Lookup string", "[Lookup]")
     /* This is the second comment. */
     CHECK ("Text Nederlands Twee" == _L ("String English Two"));
     /* This is the third comment.  */
-    CHECK ("Text Nederlands Drie" ==  _L ("String English Three"));
+    CHECK ("Text Nederlands Drie" == _L ("String English Three"));
 }