small refactoring
add reference to ShrinkWrap
more symlink tests
Merge remote-tracking branch 'origin/master'