Fix which
not to return directories
#392
+15
−4
Merged