@@ -251,8 +251,16 @@ -(id)initWithDictionary:(NSDictionary*)dict error:(NSError**)err
 
         if (property) {
 
+            // 0.0) handle structs
+            if (property.structName) {
+                NSLog(@"struct found: %@", property.structName);
+                
+                //continue to next property
+                //continue;
+            }
+            
             // 0) handle primitives
-            if (property.type == nil) {
+            if (property.type == nil && property.structName==nil) {
 
                 //just copy the value
                 [self setValue:jsonValue forKey: property.name];
@@ -326,7 +334,9 @@ -(id)initWithDictionary:(NSDictionary*)dict error:(NSError**)err
                     //JMLog(@"to type: [%@] from type: [%@] transformer: [%@]", p.type, sourceClass, selectorName);
 
                     //build a method selector for the property and json object classes
-                    NSString* selectorName = [NSString stringWithFormat:@"%@From%@:", property.type, sourceClass];
+                    NSString* selectorName = [NSString stringWithFormat:@"%@From%@:",
+                                              (property.structName? property.structName : property.type), //target name
+                                              sourceClass]; //source name
                     SEL selector = NSSelectorFromString(selectorName);
 
                     //check if there's a transformer with that name
@@ -468,7 +478,18 @@ -(void)__restrospectProperties
                     [scanner scanString:@">" intoString:NULL];
                 }
 
-            } else {
+            }
+            //check if the property is a structure
+            else if ([scanner scanString:@"{" intoString: &propertyType]) {
+                [scanner scanCharactersFromSet:[NSCharacterSet alphanumericCharacterSet]
+                                    intoString:&propertyType];
+                
+                p.isStandardJSONType = NO;
+                p.structName = propertyType;
+                
+            }
+            //the property must be a primitive
+            else {
 
                 //the property contains a primitive data type
                 [scanner scanUpToCharactersFromSet:[NSCharacterSet characterSetWithCharactersInString:@","]
@@ -664,7 +685,7 @@ -(NSDictionary*)toDictionary
             }
 
             // 2) check for standard types OR 2.1) primitives
-            if (p.isStandardJSONType || p.type==nil) {
+            if (p.structName==nil && (p.isStandardJSONType || p.type==nil)) {
                 [tempDictionary setValue:value forKeyPath: keyPath];
                 continue;
             }
@@ -673,7 +694,7 @@ -(NSDictionary*)toDictionary
             if (YES) {
 
                 //create selector from the property's class name
-                NSString* selectorName = [NSString stringWithFormat:@"%@From%@:", @"JSONObject", p.type];
+                NSString* selectorName = [NSString stringWithFormat:@"%@From%@:", @"JSONObject", p.type?p.type:p.structName];
                 SEL selector = NSSelectorFromString(selectorName);
 
                 //check if there's a transformer declared
 
@@ -29,9 +29,12 @@
 /** The name of the declared property (not the ivar name) */
 @property (copy, nonatomic) NSString* name;
 
-/** A primitive type name ("float", "short", etc) or a class name  */
+/** A property class type  */
 @property (assign, nonatomic) Class type;
 
+/** Struct name if a struct */
+@property (strong, nonatomic) NSString* structName;
+
 /** The name of the protocol the property conforms to (or nil) */
 @property (copy, nonatomic) NSString* protocol;
 
 
@@ -20,7 +20,7 @@ @implementation JSONModelClassProperty
 
 -(NSString*)description
 {
-    return [NSString stringWithFormat:@"%@[@%@]<%@> %@ %@ %@ %@", self.name, self.type?self.type:@"primitive", self.protocol?self.protocol:@"", self.isOptional?@"Optional,":@"",self.isMutable?@"Mutable,":@"",self.convertsOnDemand?@"ConvertOnDemand,":@"",self.isStandardJSONType?@"JSONType":@""];
+    return [NSString stringWithFormat:@"%@[@%@]<%@> %@ %@ %@ %@", self.name, self.type?self.type:(self.structName?self.structName:@"primitive"), self.protocol?self.protocol:@"", self.isOptional?@"Optional,":@"",self.isMutable?@"Mutable,":@"",self.convertsOnDemand?@"ConvertOnDemand,":@"",self.isStandardJSONType?@"JSONType":@""];
 }
 
 @end
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ @implementation JSONModelClassProperty`
`20`	`20`
`21`	`21`	`-(NSString*)description`
`22`	`22`	`{`
`23`		`- return [NSString stringWithFormat:@"%@[@%@]<%@> %@ %@ %@ %@", self.name, self.type?self.type:@"primitive", self.protocol?self.protocol:@"", self.isOptional?@"Optional,":@"",self.isMutable?@"Mutable,":@"",self.convertsOnDemand?@"ConvertOnDemand,":@"",self.isStandardJSONType?@"JSONType":@""];`
	`23`	`+ return [NSString stringWithFormat:@"%@[@%@]<%@> %@ %@ %@ %@", self.name, self.type?self.type:(self.structName?self.structName:@"primitive"), self.protocol?self.protocol:@"", self.isOptional?@"Optional,":@"",self.isMutable?@"Mutable,":@"",self.convertsOnDemand?@"ConvertOnDemand,":@"",self.isStandardJSONType?@"JSONType":@""];`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@end`