Refactor after new specs have been merged to master
Merge pull request #21 from SergioCrisostomo/JSONdecode

Testing until Carlesso gets tired of my PRs