Return the right object
Merge pull request #3 from roudrik/develop

Return the right object