Merge pull request #465 from jagerman/prevent-object-overwriting

Prevent overwriting previous declarations