added support for object properties
@kattrali added some pure magic this time