bugfixes
Merge pull request #1 from partouf/autodirector

bugfixes