Update references nested in other blocks
Merge pull request #398 from LLK/update-nested-references

Update references nested in other blocks