Merge pull request #172 from JensRantil/adding_cross_references