Merge pull request #291 from john-hill/develop

fix JSON return type