Handle different directory layouts better
Fixed placement of /
Merge branch 'master' into cpan