Fixes issue with %20 in paths. See https://gist.github.com/marktriggs/7575352