added jsonify methods for new classes
Merge branch 'master' of https://github.com/amni/RISC