Merge pull request #1 from WPO-Foundation/master

Update from upstream
Add parameters to adjust JSON contents
Merge pull request #356 from zeman/json

Add parameters to adjust JSON contents