Fix imported file paths.
Merge remote-tracking branch 'upstream/master'
Merge pull request #160 from alxhub/master

Port some quick fixes.