Allow for modulepaths other than pwd
Merge remote-tracking branch 'project/develop'

* project/develop:
  Allow for modulepaths other than pwd