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

Testing still