diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b1a598..ff7f36d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project (PGURE-SVT CXX)
 set(OS unix)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_aux/Modules/")
 
-option(BUILD_LIBRARY "Build the shared library" OFF)
+option(BUILD_LIBRARY "Build the shared library" ON)
 option(BUILD_EXECUTABLE "Build a standalone executable" ON)
 
 include(CheckIncludeFileCXX)
diff --git a/src/lib-PGURE-SVT.cpp b/src/lib-PGURE-SVT.cpp
index ffb92cd..7080803 100644
--- a/src/lib-PGURE-SVT.cpp
+++ b/src/lib-PGURE-SVT.cpp
@@ -214,7 +214,12 @@ extern "C" int PGURESVT(double *X,
 		// Perform noise estimation
 		if(pgureOpt) {
 		    NoiseEstimator *noise = new NoiseEstimator;
-		    noise->Estimate(u, alpha, mu, sigma, 8, NoiseMethod);
+		    noise->Estimate(u,
+		                    alpha,
+		                    mu,
+		                    sigma,
+		                    8,
+		                    NoiseMethod);
 		    delete noise;
 		}
 		
@@ -225,7 +230,12 @@ extern "C" int PGURESVT(double *X,
 		/////////////////////////////
 
 		MotionEstimator *motion = new MotionEstimator;
-		motion->Estimate(ufilter, timeiter, framewindow, num_images, Bs, Bo, MotionP);
+		motion->Estimate(ufilter,
+		                 timeiter,
+		                 framewindow,
+		                 num_images,
+		                 Bs,
+		                 MotionP);
 		arma::icube sequencePatches = motion->GetEstimate();
 		delete motion;
 
@@ -236,7 +246,13 @@ extern "C" int PGURESVT(double *X,
 		/////////////////////////////
 
 		PGURE *optimizer = new PGURE;
-		optimizer->Initialize(u, sequencePatches, Bs, Bo, alpha, sigma, mu);	
+		optimizer->Initialize(u,
+		                      sequencePatches,
+		                      Bs,
+		                      Bo,
+		                      alpha,
+		                      sigma,
+		                      mu);
 		// Determine optimum threshold value (max 1000 evaluations)
 		if(pgureOpt) {
 			lambda = (timeiter == 0) ? arma::accu(u)/(Nx*Ny*T) : lambda;