Done issue #232
Merge pull request #290 from Gudini/dir

Done issue #232