diff --git a/demo.c b/demo.c
index 0de80fa..1f6cac7 100644
--- a/demo.c
+++ b/demo.c
@@ -21,7 +21,7 @@ static void jsmn_dump_obj(jsmntok_t *obj, const char *js) {
 
 	len = obj->end - obj->start;
 
-	printf("[%3d,%3d] (%c) ", obj->start, obj->end,
+	printf("[%3d,%3d - %2d] (%c) ", obj->start, obj->end, obj->size,
 		({
 			char c;
 			switch (obj->type) {
diff --git a/jsmn.c b/jsmn.c
index 3f2b149..9907e27 100644
--- a/jsmn.c
+++ b/jsmn.c
@@ -11,6 +11,7 @@ static jsmntok_t *jsmn_get_token(jsmn_parser *parser) {
 	for (i = parser->curtoken; i<parser->num_tokens; i++) {
 		if (tokens[i].start == -1 && tokens[i].end == -1) {
 			parser->curtoken = i;
+			tokens[i].size = 0;
 			return &tokens[i];
 		}
 	}
@@ -40,6 +41,7 @@ void jsmn_init_parser(jsmn_parser *parser, const char *js,
 	parser->tokens = tokens;
 	parser->num_tokens = num_tokens;
 	parser->curtoken = 0;
+	parser->cursize = NULL;
 
 	for (i = 0; i < parser->num_tokens; i++) {
 		jsmn_fill_token(&parser->tokens[i], JSMN_PRIMITIVE, -1, -1);
@@ -132,7 +134,7 @@ static int jsmn_parse_string(jsmn_parser *parser) {
  */
 jsmnerr_t jsmn_parse(jsmn_parser *parser) {
 	int r;
-	unsigned int i;
+	int i;
 	const char *js;
 	jsmntype_t type;
 	jsmntok_t *token;
@@ -147,8 +149,11 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser) {
 				token = jsmn_get_token(parser);
 				if (token == NULL)
 					return JSMN_ERROR_NOMEM;
+				if (parser->cursize != NULL)
+					(*parser->cursize)++;
 				token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
 				token->start = parser->pos;
+				parser->cursize = &token->size;
 				break;
 			case '}': case ']':
 				type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
@@ -158,20 +163,32 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser) {
 						if (token->type != type) {
 							return JSMN_ERROR_INVAL;
 						}
+						parser->cursize = NULL;
 						token->end = parser->pos + 1;
 						break;
 					}
 				}
+				for (; i >= 0; i--) {
+					token = &parser->tokens[i];
+					if (token->start != -1 && token->end == -1) {
+						parser->cursize = &token->size;
+						break;
+					}
+				}
 				break;
 			case '-': case '0': case '1' : case '2': case '3' : case '4':
 			case '5': case '6': case '7' : case '8': case '9':
 			case 't': case 'f': case 'n' :
 				r = jsmn_parse_primitive(parser);
 				if (r < 0) return r;
+				if (parser->cursize != NULL)
+					(*parser->cursize)++;
 				break;
 			case '\"':
 				r = jsmn_parse_string(parser);
 				if (r < 0) return r;
+				if (parser->cursize != NULL)
+					(*parser->cursize)++;
 				break;
 			case '\t' : case '\r' : case '\n' : case ':' : case ',': case ' ': 
 				break;
diff --git a/jsmn.h b/jsmn.h
index a455696..8b21cab 100644
--- a/jsmn.h
+++ b/jsmn.h
@@ -32,6 +32,7 @@ typedef struct {
 	jsmntype_t type;
 	int start;
 	int end;
+	int size;
 } jsmntok_t;
 
 /**
@@ -43,6 +44,7 @@ typedef struct {
 	unsigned int pos;
 	unsigned int num_tokens;
 	int curtoken;
+	int *cursize;
 	jsmntok_t *tokens;
 } jsmn_parser;
 
diff --git a/test.sh b/test.sh
index 05d52b8..d6dbcf9 100644
--- a/test.sh
+++ b/test.sh
@@ -21,7 +21,7 @@ PASSED=0
 FAILED=0
 
 function expect() {	
-	ret=$(./demo -t 10 -b 256 - | grep -A 1 "$1" | tail -n 1 | cut -c 15-)
+	ret=$(./demo -t 10 -b 256 - | grep -A 1 "$1" | tail -n 1 | cut -c 20-)
 	if [ "x$ret" = "x$2" ]; then
 		PASSED=$(($PASSED+1))
 	else