Fix path related issues
Merge branch 'master' of https://github.com/NiceSystems/hrider