Fixing some UNIX path issues, resolves #140