diff --git a/Makefile b/Makefile
index b6ed25e..3a427c3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,18 @@ OBJECTS=$(SOURCES:src/%.cpp=obj/%.o)
 EXECUTABLE=JSONDemo
 
 all:	$(SOURCES) $(EXECUTABLE)
-	
-$(EXECUTABLE):	$(OBJECTS) 
+
+$(EXECUTABLE):	$(OBJECTS)
 		$(CC) $(LFLAGS) $(OBJECTS) -o $@
 
 obj/%.o:	src/%.cpp $(HEADERS)
 		@test -d $(@D) || mkdir -p $(@D)
 		$(CC) $(CFLAGS) $(@:obj/%.o=src/%.cpp) -o $@
 
+test: $(EXECUTABLE)
+		./$(EXECUTABLE) -t
+
 clean:
 		rm -f $(OBJECTS) $(EXECUTABLE)
 
+.PHONY: clean test
diff --git a/src/JSONValue.h b/src/JSONValue.h
index 1e38228..5cfff18 100644
--- a/src/JSONValue.h
+++ b/src/JSONValue.h
@@ -40,13 +40,13 @@ class JSONValue
 
 	public:
 		JSONValue(/*NULL*/);
-		JSONValue(const wchar_t *m_char_value);
-		JSONValue(const std::wstring &m_string_value);
-		JSONValue(bool m_bool_value);
-		JSONValue(double m_number_value);
-		JSONValue(int m_integer_value);
-		JSONValue(const JSONArray &m_array_value);
-		JSONValue(const JSONObject &m_object_value);
+		explicit JSONValue(const wchar_t *m_char_value);
+		explicit JSONValue(const std::wstring &m_string_value);
+		explicit JSONValue(bool m_bool_value);
+		explicit JSONValue(double m_number_value);
+		explicit JSONValue(int m_integer_value);
+		explicit JSONValue(const JSONArray &m_array_value);
+		explicit JSONValue(const JSONObject &m_object_value);
 		JSONValue(const JSONValue &m_source);
 		~JSONValue();