Encapsulated path to cope with special chars
Merge pull request #24 from timcooper/dev

Encapsulated path to cope with special chars