Hopefully added support for mac and windows path environments