Honor -C option with path mappings
Merge pull request #507 from r4um/issue-498

Closes #498 Honor -C option with path mappings