Updated calc module to deal with Google's JSON syntax