Added support for object JSON serialization.
Merge remote-tracking branch 'origin/master'