Fix #45: Space in path is not handled correctly