Use EJSON instead of JSON
Merge branch 'gadicc-master'