Support paths containing module types
Merge pull request #45 from lpw25/fix-paths

Support paths containing module types