added convenience methods for json conversion
Merge remote-tracking branch 'origin/master'