Rolling some of the previous changes
Merge pull request #24 from jamesbrink/add_base_object_to_json

Rolling some of the previous changes