diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 4a3152a..091f328 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -88,9 +88,7 @@
 }
 
 
-char* XMLBase::ParseName( char* in, StrPair* pair );
-
-const char* XMLBase::ParseName( char* p, char** next )
+char* XMLBase::ParseName( char* p, StrPair* pair )
 {
 	char* start = p;
 	char* nextTag = 0;
diff --git a/tinyxml2.h b/tinyxml2.h
index f081758..fe3979e 100644
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -48,6 +48,7 @@
 // FIXME: refactor to be the basis for all string handling.
 class StrPair
 {
+public:
 	enum {
 		NEEDS_FLUSH = 0x01,
 		NEEDS_ENTITY_PROCESSING = 0x02,
@@ -55,7 +56,7 @@
 	};
 
 	StrPair() : flags( 0 ), start( 0 ), end( 0 ) {}
-	void Init( const char* start, char* end, int flags; ) {
+	void Init( const char* start, char* end, int flags ) {
 		this->start = start; this->end = end; this->flags = flags | NEEDS_FLUSH;
 	}
 	const char* GetStr();
@@ -80,6 +81,9 @@
 
 	inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX )  {
 		int n = 0;
+		if ( p == q ) {
+			return true;
+		}
 		while( *p && *q && *p == *q && n<nChar ) {
 			++p; ++q; ++n;
 		}
@@ -138,14 +142,14 @@
 
 	virtual void Print( FILE* cfile, int depth );
 
-	const char* Value() const { return value; }
+	const char* Value() { return value.GetStr(); }
 
 	char* ParseDeep( char* );
 
 protected:
 
 private:
-	const char* value;
+	StrPair value;
 };
 
 
@@ -153,14 +157,14 @@
 {
 	friend class XMLElement;
 public:
-	XMLAttribute( XMLElement* element ) : value( 0 ), next( 0 ) {}
+	XMLAttribute( XMLElement* element ) : next( 0 ) {}
 	virtual ~XMLAttribute()	{}
 	virtual void Print( FILE* cfile );
 
 private:
 	char* ParseDeep( char* p );
 
-	const char* value;
+	StrPair value;
 	XMLAttribute* next;
 };
 
@@ -171,7 +175,7 @@
 	XMLElement( XMLDocument* doc );
 	virtual ~XMLElement();
 
-	const char* Name() const { return name; }
+	const char* Name() { return name.GetStr(); }
 	virtual void Print( FILE* cfile, int depth );
 
 	virtual XMLElement* ToElement() { return this; }
@@ -182,7 +186,7 @@
 protected:
 
 private:
-	const char* name;
+	StrPair name;
 	bool closing;
 	XMLAttribute* rootAttribute;
 	XMLAttribute* lastAttribute;
diff --git a/tinyxml2.suo b/tinyxml2.suo
index 5924ebf..2a9ea15 100644
--- a/tinyxml2.suo
+++ b/tinyxml2.suo
Binary files differ