Merge pull request #92 from rosslagerwall/symlink-resolution