Symlinks updates
Merge pull request #613 from khawkins/update_symlinks

Symlinks updates