diff --git a/README.md b/README.md
index af48ddb..aae455c 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ Image conversion on the fly using PHP
 
 [![Join the chat at https://gitter.im/mosbth/cimage](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mosbth/cimage?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/mosbth/cimage.svg?branch=resize)](https://travis-ci.org/mosbth/cimage)
+[![CircleCI](https://circleci.com/gh/mosbth/cimage.svg?style=svg)](https://circleci.com/gh/mosbth/cimage)
 [![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=resize)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/resize)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/mosbth/cimage/badges/quality-score.png?b=resize)](https://scrutinizer-ci.com/g/mosbth/cimage/?branch=resize)
 [![Code Coverage](https://scrutinizer-ci.com/g/mosbth/cimage/badges/coverage.png?b=resize)](https://scrutinizer-ci.com/g/mosbth/cimage/?branch=resize)
diff --git a/src/CImage/CAsciiArt.php b/src/CImage/CAsciiArt.php
index 6a9a758..a2cadf0 100644
--- a/src/CImage/CAsciiArt.php
+++ b/src/CImage/CAsciiArt.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Create an ASCII version of an image.
  *
diff --git a/src/CImage/CCache.php b/src/CImage/CCache.php
index 7a35900..0b01f29 100644
--- a/src/CImage/CCache.php
+++ b/src/CImage/CCache.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Deal with the cache directory and cached items.
  *
diff --git a/src/CImage/CFastTrackCache.php b/src/CImage/CFastTrackCache.php
index 8fbf489..fd99425 100644
--- a/src/CImage/CFastTrackCache.php
+++ b/src/CImage/CFastTrackCache.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Enable a fast track cache with a json representation of the image delivery.
  *
diff --git a/src/CImage/CHttpGet.php b/src/CImage/CHttpGet.php
index 65f408c..d4c1f91 100644
--- a/src/CImage/CHttpGet.php
+++ b/src/CImage/CHttpGet.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Get a image from a remote server using HTTP GET and If-Modified-Since.
  *
diff --git a/src/CImage/CImage.php b/src/CImage/CImage.php
index 87291da..b889a17 100644
--- a/src/CImage/CImage.php
+++ b/src/CImage/CImage.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Resize and crop images on the fly, store generated images in a cache.
  *
@@ -2561,7 +2564,7 @@ class CImage
             $this->log("# Converting image to sRGB colorspace.");
         }
 
-        if (!class_exists("Imagick")) {
+        if (!class_exists("\Imagick")) {
             $this->log(" Ignoring since Imagemagick is not installed.");
             return false;
         }
@@ -2585,7 +2588,7 @@ class CImage
         // Only convert if cachedir is writable
         if (is_writable($this->saveFolder)) {
             // Load file and check if conversion is needed
-            $image      = new Imagick($this->pathToImage);
+            $image      = new \Imagick($this->pathToImage);
             $colorspace = $image->getImageColorspace();
             $this->log(" Current colorspace: " . $colorspace);
 
@@ -2593,13 +2596,13 @@ class CImage
             $hasICCProfile = (array_search('icc', $profiles) !== false);
             $this->log(" Has ICC color profile: " . ($hasICCProfile ? "YES" : "NO"));
 
-            if ($colorspace != Imagick::COLORSPACE_SRGB || $hasICCProfile) {
+            if ($colorspace != \Imagick::COLORSPACE_SRGB || $hasICCProfile) {
                 $this->log(" Converting to sRGB.");
 
                 $sRGBicc = file_get_contents($iccFile);
                 $image->profileImage('icc', $sRGBicc);
 
-                $image->transformImageColorspace(Imagick::COLORSPACE_SRGB);
+                $image->transformImageColorspace(\Imagick::COLORSPACE_SRGB);
                 $image->writeImage($this->cacheFileName);
                 return $this->cacheFileName;
             }
diff --git a/src/CImage/CImageResizer.php b/src/CImage/CImageResizer.php
index 18bb570..3d27ca0 100644
--- a/src/CImage/CImageResizer.php
+++ b/src/CImage/CImageResizer.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Resize and crop images.
  *
diff --git a/src/CImage/CRemoteImage.php b/src/CImage/CRemoteImage.php
index ec070fb..19b7a85 100644
--- a/src/CImage/CRemoteImage.php
+++ b/src/CImage/CRemoteImage.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Get a image from a remote server using HTTP GET and If-Modified-Since.
  *
diff --git a/src/CImage/CWhitelist.php b/src/CImage/CWhitelist.php
index 3ecdb97..2f2ef70 100644
--- a/src/CImage/CWhitelist.php
+++ b/src/CImage/CWhitelist.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * Act as whitelist (or blacklist).
  *
diff --git a/test/CCacheTest.php b/test/CCacheTest.php
index 574b988..6234657 100644
--- a/test/CCacheTest.php
+++ b/test/CCacheTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageDummyTest.php b/test/CImageDummyTest.php
index 70af316..30d23d1 100644
--- a/test/CImageDummyTest.php
+++ b/test/CImageDummyTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageRemoteDownloadTest.php b/test/CImageRemoteDownloadTest.php
index 0dafae1..a592a12 100644
--- a/test/CImageRemoteDownloadTest.php
+++ b/test/CImageRemoteDownloadTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageResizerByAspectRatioTest.php b/test/CImageResizerByAspectRatioTest.php
index 8c09485..04fad64 100644
--- a/test/CImageResizerByAspectRatioTest.php
+++ b/test/CImageResizerByAspectRatioTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageResizerByDensityPixelRatioTest.php b/test/CImageResizerByDensityPixelRatioTest.php
index b6c2c3d..7552b6f 100644
--- a/test/CImageResizerByDensityPixelRatioTest.php
+++ b/test/CImageResizerByDensityPixelRatioTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageResizerStrategyCropToFitTest.php b/test/CImageResizerStrategyCropToFitTest.php
index 0981ae0..b9c9efb 100644
--- a/test/CImageResizerStrategyCropToFitTest.php
+++ b/test/CImageResizerStrategyCropToFitTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
@@ -12,26 +15,26 @@ class CImageResizerStrategyCropToFitTest extends \PHPUnit_Framework_TestCase
      */
     public function providerImages()
     {
-        return array(
+        return [
 
             // Square
-            array(100, 100,   200,  200,    0,  0, 100, 100),
-            array(100, 100,   200,  100,    0, 25, 100,  50),
-            array(100, 100,   100,  200,   25,  0,  50, 100),
+            [100, 100,   200,  200,    0,  0, 100, 100],
+            [100, 100,   200,  100,    0, 25, 100,  50],
+            [100, 100,   100,  200,   25,  0,  50, 100],
 
             // Landscape
-            array(200, 100,   400,  200,    0,  0, 200, 100),
-            array(200, 100,    50,   50,   50,  0, 100, 100),
-            array(200, 100,   400,  100,    0, 25, 200,  50),
-            array(200, 100,   100,  400,   round(175/2),  0,  25, 100),
+            [200, 100,   400,  200,    0,  0, 200, 100],
+            [200, 100,    50,   50,   50,  0, 100, 100],
+            [200, 100,   400,  100,    0, 25, 200,  50],
+            [200, 100,   100,  400,   round(175/2),  0,  25, 100],
 
             // Portrait
-            array(100, 200,    50, 100,    0,  0, 100, 200),
-            array(100, 200,    50,  50,    0, 50, 100, 100),
-            array(100, 200,   200,  50,    0, round(175/2), 100,  25),
-            array(100, 200,   50, 200,    25,  0,  50, 200),
+            [100, 200,    50, 100,    0,  0, 100, 200],
+            [100, 200,    50,  50,    0, 50, 100, 100],
+            [100, 200,   200,  50,    0, round(175/2), 100,  25],
+            [100, 200,   50, 200,    25,  0,  50, 200],
 
-        );
+        ];
     }
 
 
@@ -73,22 +76,22 @@ class CImageResizerStrategyCropToFitTest extends \PHPUnit_Framework_TestCase
         return [
 
             // Square
-            array(100,100,  200,200,  0,0,100,100,  50,50,100,100),
-            array(100,100,  200,100,  0,0,100,100,  50,0,100,100),
-            array(100,100,  100,200,  0,0,100,100,  0,50,100,100),
+            [100,100,  200,200,  0,0,100,100,  50,50,100,100],
+            [100,100,  200,100,  0,0,100,100,  50,0,100,100],
+            [100,100,  100,200,  0,0,100,100,  0,50,100,100],
 
             // Landscape
-            array(200,100,  400,200,  0,0,200,100,  100,50,200,100),
-            array(200,100,  50,50,   50,0,100,100,  0,0,200,100),
+            [200,100,  400,200,  0,0,200,100,  100,50,200,100],
+            //[200,100,  50,50,   50,0,100,100,  0,0,200,100],
         /*
-            array(200, 100,   400,  100,    0, 25, 200,  50),
-            array(200, 100,   100,  400,   round(175/2),  0,  25, 100),
+            [200, 100,   400,  100,    0, 25, 200,  50],
+            [200, 100,   100,  400,   round(175/2),  0,  25, 100],
 
             // Portrait
-            array(100, 200,    50, 100,    0,  0, 100, 200),
-            array(100, 200,    50,  50,    0, 50, 100, 100),
-            array(100, 200,   200,  50,    0, round(175/2), 100,  25),
-            array(100, 200,   50, 200,    25,  0,  50, 200),
+            [100, 200,    50, 100,    0,  0, 100, 200],
+            [100, 200,    50,  50,    0, 50, 100, 100],
+            [100, 200,   200,  50,    0, round(175/2), 100,  25],
+            [100, 200,   50, 200,    25,  0,  50, 200],
 /* */
         ];
     }
diff --git a/test/CImageResizerStrategyFillToFitTest.php b/test/CImageResizerStrategyFillToFitTest.php
index 4f59dfd..d2d72ed 100644
--- a/test/CImageResizerStrategyFillToFitTest.php
+++ b/test/CImageResizerStrategyFillToFitTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageResizerStrategyKeepAspectRatioTest.php b/test/CImageResizerStrategyKeepAspectRatioTest.php
index a424d08..c151556 100644
--- a/test/CImageResizerStrategyKeepAspectRatioTest.php
+++ b/test/CImageResizerStrategyKeepAspectRatioTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageResizerStrategyStretchTest.php b/test/CImageResizerStrategyStretchTest.php
index d313f24..0a54796 100644
--- a/test/CImageResizerStrategyStretchTest.php
+++ b/test/CImageResizerStrategyStretchTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CImageResizerTest.php b/test/CImageResizerTest.php
index 64c5a9e..9fd7cd1 100644
--- a/test/CImageResizerTest.php
+++ b/test/CImageResizerTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
@@ -59,7 +62,7 @@ class CImageResizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLogger()
     {
-        $img = new CImageResizer('loggerDummy');
+        $img = new CImageResizer('Mos\CImage\loggerDummy');
 
         $img->setBaseWidthHeight(100, 100);
     }
diff --git a/test/CImageSRGBTest.php b/test/CImageSRGBTest.php
index 906220f..955d117 100644
--- a/test/CImageSRGBTest.php
+++ b/test/CImageSRGBTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *
diff --git a/test/CWhitelistTest.php b/test/CWhitelistTest.php
index ef7538a..a165679 100644
--- a/test/CWhitelistTest.php
+++ b/test/CWhitelistTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Mos\CImage;
+
 /**
  * A testclass
  *