Merge pull request #649 from DavidS/feature/implement-additional-reference-path