Feature/allow dirs

The commit message speaks for itself.