diff --git a/examples/src/Main.cpp b/examples/src/Main.cpp
index 5b3fd6a..e5c5221 100644
--- a/examples/src/Main.cpp
+++ b/examples/src/Main.cpp
@@ -37,7 +37,7 @@ int main()
 		//auto result = loader.Load(fileData, "test_data/1ch/44100/64/test.wav");
 		
 		//auto result = loader.Load(fileData, "test_data/2ch/44100/8/test.wav");
-		auto result = loader.Load(fileData, "test_data/2ch/44100/16/test.wav");
+		//auto result = loader.Load(fileData, "test_data/2ch/44100/16/test.wav");
 		//auto result = loader.Load(fileData, "test_data/2ch/44100/24/test.wav");
 		//auto result = loader.Load(fileData, "test_data/2ch/44100/32/test.wav");
 		//auto result = loader.Load(fileData, "test_data/2ch/44100/64/test.wav");
@@ -64,6 +64,9 @@ int main()
 		//auto result = loader.Load(fileData, "test_data/ad_hoc/TestBeat_Int32.wv");
 		//auto result = loader.Load(fileData, "test_data/ad_hoc/TestBeat_Int24_Mono.wv");
 		
+        //auto result = loader.Load(fileData, "test_data/ad_hoc/44_16_stereo.mpc");
+        auto result = loader.Load(fileData, "test_data/ad_hoc/44_16_mono.mpc");
+        
 		std::cout << "[Debug] Loader Status: " << result << std::endl;
 	}
 	catch (std::exception e)
diff --git a/include/libnyquist/Common.h b/include/libnyquist/Common.h
index e91753a..27f3d17 100644
--- a/include/libnyquist/Common.h
+++ b/include/libnyquist/Common.h
@@ -142,7 +142,7 @@ inline bool isOdd(const T x)
 
 inline uint64_t Pack(uint32_t a, uint32_t b)
 {
-    uint64_t tmp =  (uint64_t) b << 32 | (uint64_t) a;
+    uint64_t tmp = (uint64_t) b << 32 | (uint64_t) a;
 #ifdef ARCH_CPU_LITTLE_ENDIAN
     return tmp;
 #else
@@ -152,7 +152,7 @@ inline uint64_t Pack(uint32_t a, uint32_t b)
 
 inline uint32_t Pack(uint16_t a, uint16_t b)
 {
-    uint32_t tmp =  (uint32_t) b << 16 | (uint32_t) a;
+    uint32_t tmp = (uint32_t) b << 16 | (uint32_t) a;
 #ifdef ARCH_CPU_LITTLE_ENDIAN
     return tmp;
 #else
@@ -162,7 +162,7 @@ inline uint32_t Pack(uint16_t a, uint16_t b)
 
 inline uint16_t Pack(uint8_t a, uint8_t b)
 {
-    uint16_t tmp =  (uint16_t) b << 8 | (uint16_t) a;
+    uint16_t tmp = (uint16_t) b << 8 | (uint16_t) a;
 #ifdef ARCH_CPU_LITTLE_ENDIAN
     return tmp;
 #else