Fix problem with paths containing spaces (fixes #5 and #7)