Better dir handling.
Bump to v4.1.9