#257 Added windows specific path chars
Merge branch 'master' into 257