Resolve symlinks properly
Merge remote-tracking branch 'refs/remotes/origin/resolve-symlinks'
Release v0.4.1.