Fix cross-referencing issues (closes #9)

Merged André Anjos requested to merge issue_9 into master

Merge request reports