Updated for new data
Merge pull request #9 from SimonbJohnson/master

Updated for new data