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

Refactor after new specs have been merged to master