diff --git a/Makefile-debian b/Makefile-debian
index 18da60e..a5bdb9b 100755
--- a/Makefile-debian
+++ b/Makefile-debian
@@ -25,7 +25,7 @@ INSTALL  = $(LIBTOOL) --mode=install install -m644
 FINISH   = $(LIBTOOL) --mode=finish
 CLEAN    = $(LIBTOOL) --mode=clean $(RM)
 
-SOURCES = src/SmallObj.cpp src/Singleton.cpp
+SOURCES = src/SmallObj.cpp src/Singleton.cpp src/OrderedStatic.cpp
 
 libloki.la: $(patsubst %.cpp,%.lo,$(SOURCES))
 	$(LINK) -o $@ $^
diff --git a/src/Makefile b/src/Makefile
index 4dc97b9..31a30e3 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,8 +2,8 @@
 
 CPP = g++ 
 CC = gcc 
-OBJ = Singleton.o SmallObj.o 
-LINKOBJ = Singleton.o SmallObj.o 
+OBJ = Singleton.o SmallObj.o OrderedStatic.o
+LINKOBJ = Singleton.o SmallObj.o OrderedStatic.o
 LIBS = 
 CXXINCS = -I..\include 
 BIN = ../lib/libloki.a
@@ -37,3 +37,6 @@ Singleton.o: Singleton.cpp
 SmallObj.o: SmallObj.cpp
 	$(CPP) -c SmallObj.cpp -o SmallObj.o $(CXXFLAGS)
 	
+OrderedStatic.o: OrderedStatic.cpp
+	$(CPP) -c OrderedStatic.cpp -o OrderedStatic.o $(CXXFLAGS)
+	
diff --git a/src/make.msvc.bat b/src/make.msvc.bat
index 69b0e56..091d5f2 100755
--- a/src/make.msvc.bat
+++ b/src/make.msvc.bat
@@ -4,12 +4,12 @@ if not defined LOKI_MSVC_NOLIB (
 
 if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo.\tmp\ SmallObj.cpp Singleton.cpp
+cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo.\tmp\ SmallObj.cpp Singleton.cpp OrderedStatic.cpp
 
-lib /NOLOGO /OUT:"..\lib\loki.lib" tmp\SmallObj.obj tmp\Singleton.obj
+lib /NOLOGO /OUT:"..\lib\loki.lib" tmp\SmallObj.obj tmp\Singleton.obj tmp\OrderedStatic.obj
 
 ) else (
 
-cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp
+cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp OrderedStatic.cpp
 
 )
\ No newline at end of file
diff --git a/test/Makefile b/test/Makefile
index 1444fba..7a7506d 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,6 +4,8 @@ MAKEFILE = Makefile
 SUBTARGETS	= \
 		sub-Factory \
 		sub-flex_string \
+		sub-Longevity \
+		sub-OrderedStatic \
 		sub-RegressionTest \
 		sub-SafeFormat \
 		sub-SmallObj 
@@ -35,6 +37,16 @@ sub-SmallObj: FORCE
 	$(MAKE) -f $(MAKEFILE)
 	@cd ..
 	
+sub-OrderedStatic: FORCE
+	cd OrderedStatic && \
+	$(MAKE) -f $(MAKEFILE)
+	@cd ..
+	
+sub-Longevity: FORCE
+	cd Longevity && \
+	$(MAKE) -f $(MAKEFILE)
+	@cd ..
+	
 clean: 
 	cd Factory && \
 	$(MAKE) -f $(MAKEFILE) clean
@@ -42,6 +54,12 @@ clean:
 	cd flex_string && \
 	$(MAKE) -f $(MAKEFILE) clean
 	@cd ..
+	cd Longevity && \
+	$(MAKE) -f $(MAKEFILE) clean
+	@cd ..
+	cd OrderedStatic && \
+	$(MAKE) -f $(MAKEFILE) clean
+	@cd ..
 	cd RegressionTest && \
 	$(MAKE) -f $(MAKEFILE) clean
 	@cd ..
@@ -54,6 +72,5 @@ clean:
 
 
 
-
 FORCE:
 
diff --git a/test/OrderedStatic/Makefile b/test/OrderedStatic/Makefile
index c02cbbf..61044a2 100755
--- a/test/OrderedStatic/Makefile
+++ b/test/OrderedStatic/Makefile
@@ -6,7 +6,7 @@ OBJ = main.o
 LINKOBJ = main.o 
 CXXINCS = -I./../../include -I.
 LIBS = -L../../lib -lloki
-CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG -pedantic
+CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG 
 BIN = main-gcc.exe
 RM = rm -f
 CHK_DIR_EXISTS= if not exist
diff --git a/test/OrderedStatic/make.msvc.bat b/test/OrderedStatic/make.msvc.bat
index 2a29747..e643214 100755
--- a/test/OrderedStatic/make.msvc.bat
+++ b/test/OrderedStatic/make.msvc.bat
@@ -1,6 +1,6 @@
 if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -wd4710 -I"." -I"..\..\include" -Fotmp\ main.cpp
+cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ main.cpp 
 
 if not defined LOKI_MSVC_NOLIB (
 
@@ -8,6 +8,6 @@ link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\l
 
 ) else (
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj tmp\OrderedStatic.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\OrderedStatic.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
 
 )
diff --git a/test/make.msvc.bat b/test/make.msvc.bat
index 8cb3c85..91dc7b5 100755
--- a/test/make.msvc.bat
+++ b/test/make.msvc.bat
@@ -7,6 +7,14 @@ cd flex_string
 call make.msvc.bat
 cd ..
 
+cd Longevity
+call make.msvc.bat
+cd ..
+
+cd OrderedStatic
+call make.msvc.bat
+cd ..
+
 cd RegressionTest
 call make.msvc.bat
 cd ..