diff --git a/langutils.d b/langutils.d
index 11aad83..9c642ba 100644
--- a/langutils.d
+++ b/langutils.d
@@ -59,10 +59,10 @@ enum TokenType: uint
 	vararg,	/// ...
 	bitAnd,	/// &
 	bitAndEquals,	/// &=
-	lAnd,	/// &&
+	logicAnd,	/// &&
 	bitOr,	/// |
 	bitOrEquals,	/// |=
-	lOr,	/// ||
+	logicOr,	/// ||
 	minus,	/// -
 	minusEquals,	/// -=
 	uMinus,	/// --
@@ -119,6 +119,8 @@ enum TokenType: uint
 // Types
 	TYPES_BEGIN,
 	tString, /// string
+	tWString, /// wstring
+	tDString, /// dstring
 	tBool, /// bool,
 	tByte, /// byte,
 	tCdouble, /// cdouble,
@@ -264,7 +266,11 @@ enum TokenType: uint
 	longLiteral, /// 123L
 	unsignedLongLiteral, /// 123uL
 	NUMBERS_END,
+	STRINGS_BEGIN,
 	stringLiteral, /// "a string"
+	wStringLiteral, /// "16-bit character string"w
+	dStringLiteral, /// "32-bit character string"d
+	STRINGS_END,
 	identifier, /// anything else
 	whitespace, /// whitespace
 	blank, /// unknown token type
@@ -310,6 +316,7 @@ static this()
 		"deprecated" : TokenType.tDeprecated,
 		"do" : TokenType.tDo,
 		"double" : TokenType.tDouble,
+		"dstring" : TokenType.tDString,
 		"else" : TokenType.tElse,
 		"enum" : TokenType.tEnum,
 		"export" : TokenType.tExport,
@@ -384,6 +391,7 @@ static this()
 		"wchar" : TokenType.tWchar,
 		"while" : TokenType.tWhile,
 		"with" : TokenType.tWith,
+		"wstring" : TokenType.tWString,
 		"__FILE__" : TokenType.t__FILE__,
 		"__LINE__" : TokenType.t__LINE__,
 		"__gshared" : TokenType.t__gshared,
diff --git a/tokenizer.d b/tokenizer.d
index b9b0fc3..13394bf 100644
--- a/tokenizer.d
+++ b/tokenizer.d
@@ -49,7 +49,7 @@ pure nothrow string lexWhitespace(S)(S inputString, ref size_t endIndex,
 }
 
 /**
- * If inputString starts from #!, increments endIndex until it indexes the next line.
+ * If inputString starts with #!, increments endIndex until it indexes the next line.
  * Params:
  *     inputString = the source code to examine
  *     endIndex = an index into inputString
@@ -139,7 +139,6 @@ pure nothrow string lexComment(S)(ref S inputString, ref size_t endIndex,
  *     quote = the opening (and closing) quote character for the string to be
  *         lexed
  * Returns: a string literal, including its opening and closing quote characters
- * Bugs: Does not handle string suffixes
  */
 pure nothrow string lexString(S, C)(S inputString, ref size_t endIndex, ref uint lineNumber,
 	C quote, bool canEscape = true) if (isSomeString!S && isSomeChar!C)
@@ -609,14 +608,14 @@ Token[] tokenize(S)(S inputString, IterationStyle iterationStyle = IterationStyl
 			">",    "TokenType.greater",
 			">=",   "TokenType.greaterEqual",
 			"#",    "TokenType.hash",
-			"&&",   "TokenType.lAnd",
+			"&&",   "TokenType.logicAnd",
 			"{",    "TokenType.lBrace",
 			"[",    "TokenType.lBracket",
 			"<",    "TokenType.less",
 			"<=",   "TokenType.lessEqual",
 			"<>=",  "TokenType.lessEqualGreater",
 			"<>",   "TokenType.lessOrGreater",
-			"||",   "TokenType.lOr",
+			"||",   "TokenType.logicOr",
 			"(",    "TokenType.lParen",
 			"-",    "TokenType.minus",
 			"-=",   "TokenType.minusEquals",