updates to correct mismatch with data model
Merge pull request #9 from bartcharbon/master

updates to correct mismatch with data model