Make it possible to override nested object fields
Fix issue #24
Merge branch 'master' into tests