Updated to reflect property mapping changes.
Merge pull request #19 from brettwooldridge/master

Updated to reflect property mapping changes.