Fix path lookups
Merge pull request #32 from lpw25/master

Fix path lookups