Fixed #18
Fixed #19 (plus basic support for objects)