Merge pull request #12 from Vampire/master

Better fix for issue #8, that allows overwriting the properties in question