Fixed to object types
Merge pull request #1 from esisa/master

Fixed to object types