Changed property check for object
Merge pull request #16 from karolisg/master

Changed property check for object