Merge pull request #7 from gsn/production

Production
24600 - update to get to object properties
Merge pull request #359 from cannontech/production

Production