Added support for unicode paths