Adding XML and JSON helpers
Merge remote-tracking branch 'origin/master'