added hasOwnProperty checks
Merge pull request #705 from bloodyowl/master

added hasOwnProperty checks