Properly resolve broken sym links
Merge pull request #309 from RunningLight/master

Properly resolve broken sym links - issue #308