JSON added
Code cleanup
Again..
Merge remote-tracking branch 'origin/JSON'