Merge pull request #15 from jabranr/master

Updates to data, files and fixes issue #12, issue #14