Fixing exjson compile
Merge branch 'deploy'