Changes to json serializer
Merge pull request #360 from jfarid27/import-redux

Changes to json serializer