Merge pull request #135 from wpreul/master

Fix for paths with hyphens and increase timeout
Moving to authors file and adding my name