fix issue #12
fix issue #14
Merge branch 'fix-issue-12'
bump version
update combined data
Merge pull request #15 from jabranr/master

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