JSON additions
Merge branch 'master' of https://github.com/alexthemitchell/DORMSDB