Improves path handling
Adds windows support