Fix support for multiple objects
Merge pull request #2 from Ogeon/master

Fix support for multiple objects