Merge pull request #15 from neilnorthrop/master

another update to .rb and .json file