Improve handling of relative paths in modules
Merge pull request #104 from rnc/master

Improve handling of relative paths in modules