Merge pull request #1 from gcavallanti/master

correct/update linking — nice update—Thanks!
Quote any path expansion variables