Fix for paths with hyphens and increase timeout
Merge pull request #135 from wpreul/master

Fix for paths with hyphens and increase timeout