Added id to json
Merge pull request #313 from pigalot/master

Added id to json