json fix
Merge branch 'master' of https://github.com/SquareWave/mb-hackathon-hacking