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

Testing... to merge