Now supports entity properties with underscore
Merge pull request #20 from rbaarsma/support_entities_with_underscore

Now supports entity properties with underscore