data object re-written
json obj. fix
Merge branch 'master' into localDev