diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b3c3563..9ead3ddc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,19 +44,28 @@ IF (APPLE)
 ENDIF(APPLE)
 
 ################ IMAGE MAGICK ##################
+# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
+IF (MAGICKCORE_QUANTUM_DEPTH)
+	add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
+ELSE (MAGICKCORE_QUANTUM_DEPTH)
+	add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=16 )
+ENDIF (MAGICKCORE_QUANTUM_DEPTH)
+IF (MAGICKCORE_HDRI_ENABLE)
+	add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
+ELSE (MAGICKCORE_HDRI_ENABLE)
+	add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 )
+ENDIF (MAGICKCORE_HDRI_ENABLE)
+IF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+	add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=${OPENSHOT_IMAGEMAGICK_COMPATIBILITY} )
+ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+	add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=0 )
+ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+
 # Find the ImageMagick++ library
 FIND_PACKAGE(ImageMagick REQUIRED COMPONENTS Magick++ MagickWand MagickCore)
 
 # Include ImageMagick++ headers (needed for compile)
 include_directories(${ImageMagick_INCLUDE_DIRS})
-
-# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
-IF (MAGICKCORE_QUANTUM_DEPTH)
-	add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
-ENDIF (MAGICKCORE_QUANTUM_DEPTH)
-IF (MAGICKCORE_HDRI_ENABLE)
-	add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
-ENDIF (MAGICKCORE_HDRI_ENABLE)
 	
 ################### FFMPEG #####################
 # Find FFmpeg libraries (used for video encoding / decoding)
@@ -173,6 +182,7 @@ SET ( OPENSHOT_SOURCE_FILES
 		FrameMapper.cpp
 		KeyFrame.cpp
 		ImageReader.cpp
+		ImageWriter.cpp
 		PlayerBase.cpp
 		Point.cpp
 		Profiles.cpp
@@ -239,19 +249,19 @@ SET ( REQUIRED_LIBRARIES
 target_link_libraries(openshot ${REQUIRED_LIBRARIES})
 
 
-############### TEST EXECUTABLE ################
+############### CLI EXECUTABLE ################
 # Create test executable
 add_executable(example Main.cpp)
 
 # Link test executable to the new library
 target_link_libraries(example openshot)
 
-############### TEST QT EXECUTABLE ################
+############### PLAYER EXECUTABLE ################
 # Create test executable
-add_executable(demo_player Qt/demo/main.cpp)
+add_executable(openshot_player Qt/demo/main.cpp)
 
 # Link test executable to the new library
-target_link_libraries(demo_player openshot)
+target_link_libraries(openshot_player openshot)
 
 ############### TEST BLACKMAGIC CAPTURE APP ################
 IF (BLACKMAGIC_FOUND)
diff --git a/src/bindings/python/openshot.i b/src/bindings/python/openshot.i
index ed1d1c0e..096033f6 100644
--- a/src/bindings/python/openshot.i
+++ b/src/bindings/python/openshot.i
@@ -70,6 +70,7 @@
 #include "../../../include/Frame.h"
 #include "../../../include/FrameMapper.h"
 #include "../../../include/ImageReader.h"
+#include "../../../include/ImageWriter.h"
 #include "../../../include/PlayerBase.h"
 #include "../../../include/Point.h"
 #include "../../../include/Profiles.h"
@@ -112,6 +113,7 @@
 %include "../../../include/Frame.h"
 %include "../../../include/FrameMapper.h"
 %include "../../../include/ImageReader.h"
+%include "../../../include/ImageWriter.h"
 %include "../../../include/PlayerBase.h"
 %include "../../../include/Point.h"
 %include "../../../include/Profiles.h"
diff --git a/src/bindings/ruby/openshot.i b/src/bindings/ruby/openshot.i
index 7220a8cb..00a85805 100644
--- a/src/bindings/ruby/openshot.i
+++ b/src/bindings/ruby/openshot.i
@@ -76,6 +76,7 @@ namespace tr1
 #include "../../../include/Frame.h"
 #include "../../../include/FrameMapper.h"
 #include "../../../include/ImageReader.h"
+#include "../../../include/ImageWriter.h"
 #include "../../../include/PlayerBase.h"
 #include "../../../include/Point.h"
 #include "../../../include/Profiles.h"
@@ -118,6 +119,7 @@ namespace tr1
 %include "../../../include/Frame.h"
 %include "../../../include/FrameMapper.h"
 %include "../../../include/ImageReader.h"
+%include "../../../include/ImageWriter.h"
 %include "../../../include/PlayerBase.h"
 %include "../../../include/Point.h"
 %include "../../../include/Profiles.h"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6753ffbf..47106f4b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -41,21 +41,29 @@ FIND_PACKAGE(UnitTest++ REQUIRED)
 include_directories(${UNITTEST++_INCLUDE_DIR})
 
 ################ IMAGE MAGICK ##################
-# Find the ImageMagick++ library
-FIND_PACKAGE(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
-
-# Include ImageMagick++ headers (needed for compile)
-include_directories(${ImageMagick_INCLUDE_DIRS})
-
 # Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
 IF (MAGICKCORE_QUANTUM_DEPTH)
 	add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
-	MESSAGE("-- MAGICKCORE_QUANTUM_DEPTH = ${MAGICKCORE_QUANTUM_DEPTH}")
+ELSE (MAGICKCORE_QUANTUM_DEPTH)
+	add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=16 )
 ENDIF (MAGICKCORE_QUANTUM_DEPTH)
 IF (MAGICKCORE_HDRI_ENABLE)
 	add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
-	MESSAGE("-- MAGICKCORE_HDRI_ENABLE = ${MAGICKCORE_HDRI_ENABLE}")
+ELSE (MAGICKCORE_HDRI_ENABLE)
+	add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 )
 ENDIF (MAGICKCORE_HDRI_ENABLE)
+IF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+	add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=${OPENSHOT_IMAGEMAGICK_COMPATIBILITY} )
+ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+	add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=0 )
+ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+
+# Find the ImageMagick++ library
+FIND_PACKAGE(ImageMagick REQUIRED COMPONENTS Magick++ MagickWand MagickCore)
+
+# Include ImageMagick++ headers (needed for compile)
+include_directories(${ImageMagick_INCLUDE_DIRS})
+	
 
 ################### FFMPEG #####################
 # Find FFmpeg libraries (used for video encoding / decoding)
@@ -140,8 +148,10 @@ IF (ENABLE_TESTS)
 	SET ( OPENSHOT_TEST_FILES ${OPENSHOT_TEST_FILES} 
 		   Cache_Tests.cpp
 		   Clip_Tests.cpp
+		   Color_Tests.cpp
 		   Coordinate_Tests.cpp
 		   ReaderBase_Tests.cpp
+		   ImageWriter_Tests.cpp
 		   FFmpegReader_Tests.cpp
 		   FFmpegWriter_Tests.cpp
 		   Fraction_Tests.cpp