Fix module bug and absolute paths
Merge remote-tracking branch 'upstream/master'