ADDED: Export to JSON
Merge remote-tracking branch 'origin/master'