working and tested (a little) version
Merge branch 'dev-symlinks'