Fixes #645 - Making cross-content linking windows compatible

Please see issue #645 for more details.