Change functionality of JSONReader
Merge remote-tracking branch 'origin/master'