new vesion with force JSON getter
Merge remote-tracking branch 'origin/master'