Fixes #6 - Fix possible object duplication
Merge pull request #9 from andredasilvapinto/fix_obj_duplication

Fixes #6 - Fix possible object duplication