Resolve merge conflict due to change in JSON data type/format
Merge pull request #21 from BustinBash/andra_refactor

Resolve merge conflict due to change in JSON data type/format