Fixing path bugs
Merge pull request #77 from gnauhnoj/origin/devtest

Fix path bugs