Updating model to prefer properties to data array

Fixed #92
Merge pull request #103 from ianbarber/master

Fixing model properties