Merge pull request #4 from kedder/master

More robust sub-object handling